New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
kubeadm: Update versions for 1.21 #98008
Conversation
/release-note-none |
@kubernetes/sig-cluster-lifecycle-pr-reviews |
/retest |
/approve |
the CI is failing here and kubeadm is receiving version 1.19 for some reason? let's see it fails again: |
6ddd34d
to
546b0a7
Compare
/priority backlog |
looks like some previous commits broke our unit tests a little, making them depend on hardcoded version strings. 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) |
/test pull-kubernetes-bazel-test |
@neolit123 Applied the patch diff PTAL. |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fabriziopandini, neolit123, RA489 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
update current/minimal supported versions.
xref kubernetes/kubeadm#2362