Merge pull request #11525 from medyagh/bump_k8s

bump default k8s version and newest
kubernetes · Jun 2, 2021 · 0b83c00 · 0b83c00
2 parents 27072f7 + c944930
commit 0b83c00
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 13 deletions.
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "192.168.32.0/20"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio-options-gates.yaml
@@ -46,7 +46,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/default.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/dns.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: minikube.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/image-repository.yaml
@@ -41,7 +41,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/options.yaml
@@ -43,7 +43,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.22.0-alpha.1
+kubernetesVersion: v1.22.0-alpha.2
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"

diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
@@ -34,10 +34,10 @@ var (
 const (
 	// DefaultKubernetesVersion is the default Kubernetes version
 	// dont update till #10545 is solved
-	DefaultKubernetesVersion = "v1.20.2"
+	DefaultKubernetesVersion = "v1.20.7"
 	// NewestKubernetesVersion is the newest Kubernetes version to test against
 	// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
-	NewestKubernetesVersion = "v1.22.0-alpha.1"
+	NewestKubernetesVersion = "v1.22.0-alpha.2"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.14.0"
 	// DefaultClusterName is the default nane for the k8s cluster

diff --git a/pkg/minikube/reason/k8s.go b/pkg/minikube/reason/k8s.go
@@ -41,7 +41,6 @@ var k8sIssues = []K8sIssue{
 			"1.20.4",
 			"1.20.5",
 			"1.20.6",
-			"1.20.7",
 			"1.21.0",
 			"1.21.1",
 		},

diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
@@ -66,7 +66,7 @@ minikube start [flags]
       --interactive                       Allow user prompts for more information (default true)
       --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])
       --keep-context                      This will keep the existing kubectl context and will create a minikube context.
-      --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'.
+      --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'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
       --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
       --kvm-network string                The KVM default network name. (kvm2 driver only) (default "default")