From fe91902d0843c49384056b2a8523fa5f7c56d5ff Mon Sep 17 00:00:00 2001
From: RA489 <rohit.anand@india.nec.com>
Date: Fri, 15 Jan 2021 16:36:34 +0530
Subject: [PATCH] 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)