Skip to content

Commit 0b83c00

Browse files
authored
Merge pull request #11525 from medyagh/bump_k8s
bump default k8s version and newest
2 parents 27072f7 + c944930 commit 0b83c00

File tree

12 files changed

+12
-13
lines changed

12 files changed

+12
-13
lines changed

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.22.0-alpha.1
43+
kubernetesVersion: v1.22.0-alpha.2
4444
networking:
4545
dnsDomain: cluster.local
4646
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.22.0-alpha.1
43+
kubernetesVersion: v1.22.0-alpha.2
4444
networking:
4545
dnsDomain: cluster.local
4646
podSubnet: "192.168.32.0/20"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.22.0-alpha.1
43+
kubernetesVersion: v1.22.0-alpha.2
4444
networking:
4545
dnsDomain: cluster.local
4646
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio-options-gates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ etcd:
4646
dataDir: /var/lib/minikube/etcd
4747
extraArgs:
4848
proxy-refresh-interval: "70000"
49-
kubernetesVersion: v1.22.0-alpha.1
49+
kubernetesVersion: v1.22.0-alpha.2
5050
networking:
5151
dnsDomain: cluster.local
5252
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.22.0-alpha.1
43+
kubernetesVersion: v1.22.0-alpha.2
4444
networking:
4545
dnsDomain: cluster.local
4646
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/default.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.22.0-alpha.1
43+
kubernetesVersion: v1.22.0-alpha.2
4444
networking:
4545
dnsDomain: cluster.local
4646
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/dns.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.22.0-alpha.1
43+
kubernetesVersion: v1.22.0-alpha.2
4444
networking:
4545
dnsDomain: minikube.local
4646
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/image-repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ etcd:
4141
dataDir: /var/lib/minikube/etcd
4242
extraArgs:
4343
proxy-refresh-interval: "70000"
44-
kubernetesVersion: v1.22.0-alpha.1
44+
kubernetesVersion: v1.22.0-alpha.2
4545
networking:
4646
dnsDomain: cluster.local
4747
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.22/options.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ etcd:
4343
dataDir: /var/lib/minikube/etcd
4444
extraArgs:
4545
proxy-refresh-interval: "70000"
46-
kubernetesVersion: v1.22.0-alpha.1
46+
kubernetesVersion: v1.22.0-alpha.2
4747
networking:
4848
dnsDomain: cluster.local
4949
podSubnet: "10.244.0.0/16"

pkg/minikube/constants/constants.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ var (
3434
const (
3535
// DefaultKubernetesVersion is the default Kubernetes version
3636
// dont update till #10545 is solved
37-
DefaultKubernetesVersion = "v1.20.2"
37+
DefaultKubernetesVersion = "v1.20.7"
3838
// NewestKubernetesVersion is the newest Kubernetes version to test against
3939
// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
40-
NewestKubernetesVersion = "v1.22.0-alpha.1"
40+
NewestKubernetesVersion = "v1.22.0-alpha.2"
4141
// OldestKubernetesVersion is the oldest Kubernetes version to test against
4242
OldestKubernetesVersion = "v1.14.0"
4343
// DefaultClusterName is the default nane for the k8s cluster

pkg/minikube/reason/k8s.go

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ var k8sIssues = []K8sIssue{
4141
"1.20.4",
4242
"1.20.5",
4343
"1.20.6",
44-
"1.20.7",
4544
"1.21.0",
4645
"1.21.1",
4746
},

site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ minikube start [flags]
6666
--interactive Allow user prompts for more information (default true)
6767
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.20.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.20.0/minikube-v1.20.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.20.0.iso])
6868
--keep-context This will keep the existing kubectl context and will create a minikube context.
69-
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.20.2, 'latest' for v1.22.0-alpha.1). Defaults to 'stable'.
69+
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.20.7, 'latest' for v1.22.0-alpha.2). Defaults to 'stable'.
7070
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
7171
--kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
7272
--kvm-network string The KVM default network name. (kvm2 driver only) (default "default")

0 commit comments

Comments
 (0)