From 7f528a40616892d52eaa4787013fd6c2a7692300 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 27 May 2021 12:57:23 -0700 Subject: [PATCH 1/2] bump default k8s version and newest --- pkg/minikube/constants/constants.go | 4 ++-- pkg/minikube/reason/k8s.go | 1 - site/content/en/docs/commands/start.md | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index bf2c5b6b09bc..a17021d2a13e 100644 --- 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 index 8d6ff4ea9f68..bbaa22c4fc96 100644 --- 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 index e94f2693c408..ceb8509316e1 100644 --- 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") From c944930310a2001f04d5e8c123ff608f1d1cd841 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 27 May 2021 13:09:17 -0700 Subject: [PATCH 2/2] unit test --- .../bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.22/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.22/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.22/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.22/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.22/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.22/options.yaml | 2 +- 9 files changed, 9 insertions(+), 9 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 index b20261e80c8b..3f2d77917551 100644 --- 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 index 21af8d8f7214..cf18c92e2cde 100644 --- 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 index 3895a1e73c82..4d206726f362 100644 --- 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 index f59db70a5a62..40c5f8c78376 100644 --- 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 index 17c1065c99f6..68dc004d0eab 100644 --- 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 index 64d633631b3e..df1d905b38ed 100644 --- 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 index 4210b4517925..cbef0361cf1e 100644 --- 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 index d5ee14d2bf02..9283502ed4f8 100644 --- 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 index 44f81851a5ed..35237b744f3c 100644 --- 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"