Skip to content
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

Merged
merged 2 commits into from Jan 15, 2021
Merged

Conversation

RA489
Copy link

@RA489 RA489 commented Jan 13, 2021

update current/minimal supported versions.
xref kubernetes/kubeadm#2362

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 13, 2021
@RA489
Copy link
Author

RA489 commented Jan 13, 2021

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 13, 2021
@RA489
Copy link
Author

RA489 commented Jan 13, 2021

@kubernetes/sig-cluster-lifecycle-pr-reviews
/kind cleanup

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 13, 2021
@fabriziopandini
Copy link
Member

/retest

@fabriziopandini
Copy link
Member

/approve
/cc @neolit123

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 13, 2021
@neolit123
Copy link
Member

the CI is failing here and kubeadm is receiving version 1.19 for some reason?

let's see it fails again:
/retest

@neolit123
Copy link
Member

/priority backlog
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 13, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Jan 13, 2021
@neolit123
Copy link
Member

neolit123 commented Jan 14, 2021

@RA489

looks like some previous commits broke our unit tests a little, making them depend on hardcoded version strings.
you can apply this diff with git apply patch.diff and it should work.

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)

@RA489
Copy link
Author

RA489 commented Jan 15, 2021

/test pull-kubernetes-bazel-test

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 15, 2021
@RA489
Copy link
Author

RA489 commented Jan 15, 2021

@neolit123 Applied the patch diff PTAL.

@neolit123
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2021
@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 7791bbe into kubernetes:master Jan 15, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants