From 546b0a704d587d952430d041e444373d9a534db3 Mon Sep 17 00:00:00 2001 From: RA489 Date: Wed, 13 Jan 2021 13:23:47 +0530 Subject: [PATCH 1/2] kubeadm: Update versions for 1.21 --- cmd/kubeadm/app/constants/constants.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 2eb4541fc9f..2a0a55d13d8 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -453,13 +453,13 @@ var ( ControlPlaneComponents = []string{KubeAPIServer, KubeControllerManager, KubeScheduler} // MinimumControlPlaneVersion specifies the minimum control plane version kubeadm can deploy - MinimumControlPlaneVersion = version.MustParseSemantic("v1.19.0") + MinimumControlPlaneVersion = version.MustParseSemantic("v1.20.0") // MinimumKubeletVersion specifies the minimum version of kubelet which kubeadm supports - MinimumKubeletVersion = version.MustParseSemantic("v1.19.0") + MinimumKubeletVersion = version.MustParseSemantic("v1.20.0") // CurrentKubernetesVersion specifies current Kubernetes version supported by kubeadm - CurrentKubernetesVersion = version.MustParseSemantic("v1.20.0") + CurrentKubernetesVersion = version.MustParseSemantic("v1.21.0") // SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases SupportedEtcdVersion = map[uint8]string{ @@ -472,6 +472,7 @@ var ( 19: "3.4.13-0", 20: "3.4.13-0", 21: "3.4.13-0", + 22: "3.4.13-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows From fe91902d0843c49384056b2a8523fa5f7c56d5ff Mon Sep 17 00:00:00 2001 From: RA489 Date: Fri, 15 Jan 2021 16:36:34 +0530 Subject: [PATCH 2/2] kubeadm: Update versions for 1.21 --- cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go | 2 +- cmd/kubeadm/app/cmd/certs_test.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go b/cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go index 132ca498c90..b96f5147835 100644 --- a/cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go +++ b/cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go @@ -54,7 +54,7 @@ func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, er }, CertificatesDir: certDir, ClusterName: clusterName, - KubernetesVersion: "v1.19.0", + KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(), } var buf bytes.Buffer diff --git a/cmd/kubeadm/app/cmd/certs_test.go b/cmd/kubeadm/app/cmd/certs_test.go index 17979873950..a3451c269a2 100644 --- a/cmd/kubeadm/app/cmd/certs_test.go +++ b/cmd/kubeadm/app/cmd/certs_test.go @@ -330,7 +330,7 @@ func TestRunGenCSR(t *testing.T) { ServiceSubnet: "192.0.2.0/24", }, CertificatesDir: certDir, - KubernetesVersion: "v1.19.0", + KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(), }, }, } @@ -378,7 +378,7 @@ func TestGenCSRConfig(t *testing.T) { // A minimal kubeadm config with just enough values to avoid triggering // auto-detection of config values at runtime. - const kubeadmConfig = ` + var kubeadmConfig = ` apiVersion: kubeadm.k8s.io/v1beta2 kind: InitConfiguration localAPIEndpoint: @@ -389,8 +389,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 kind: ClusterConfiguration certificatesDir: /custom/config/certificates-dir -kubernetesVersion: v1.19.0 -` +kubernetesVersion: ` + kubeadmconstants.MinimumControlPlaneVersion.String() tmpDir := testutil.SetupTempDir(t) defer os.RemoveAll(tmpDir)