Allow to use version labels in kubeadm upgrade apply command. #53043

kad · 2017-09-26T08:03:38Z

What this PR does / why we need it:

kubeadm upgrade apply now is able to utilize all possible combinations
of version argument, including labels (latest, stable-1.8, ci/latest-1.9)
as well as specific builds (v1.8.0-rc.1, ci/v1.9.0-alpha.1.123_01234567889)

As side effect, specifying exact build to deploy from CI area is now also
possible in kubeadm init command.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes kubernetes/kubeadm#451

Special notes for your reviewer:
cc @luxas

Release note:

- kubeadm init can now deploy exact build from CI area by specifying ID with "ci/" prefix. Example: "ci/v1.9.0-alpha.1.123+01234567889"
- kubeadm upgrade apply supports all standard ways of specifying version via labels. Examples: stable-1.8, latest-1.8, ci/latest-1.9 and similar.

k8s-ci-robot · 2017-09-26T08:03:45Z

Hi @kad. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

kad · 2017-09-26T08:05:15Z

There is one missing functionality in that PR: if user tries to use kubeadm upgrade apply to the latest CI version, it is possible that kubeadm will complain that it is older than version we want to upgrade to. It is probably will be good to implement as separate PR.

kad · 2017-09-26T14:48:53Z

Fix for CI version warning (issue #53055) will be fixed with PR #53058

luxas · 2017-09-26T18:19:13Z

/ok-to-test

luxas

mostly nits, LGTM generally

luxas · 2017-09-26T18:19:41Z

cmd/kubeadm/app/cmd/upgrade/apply.go

@@ -123,6 +123,19 @@ func RunApply(flags *applyFlags) error {
 	internalcfg := &kubeadmapi.MasterConfiguration{}
 	api.Scheme.Convert(upgradeVars.cfg, internalcfg, nil)

+	// Validate requested and validate actual version
+	if err := configutil.NormalizeKubernetsVersion(internalcfg); err != nil {


NormalizeKubernetesVersion

heh. typo :(
BTW, maybe make it as interface to MasterConfiguration ? so it will be

if err := internalcfg.NormalizeKubernetesVersion(); err != nil { ...

instead of configutil.NormalizeKubernetesVersion(internalcfg) ?
This function is anyway usable only with that type.

haven't decided how to generally deal with that, so as-is is fine for now

luxas · 2017-09-26T18:23:24Z

cmd/kubeadm/app/util/version.go

@@ -92,6 +97,18 @@ func KubernetesIsCIVersion(version string) bool {
 	return false
 }

+// Internal helper: returns normalized build version (with "v" prefix if needed)
+// If input doesn't match known version pattern, returns empty string.
+func normalizedBuildVersion(version string) string {


should have unit test

luxas · 2017-09-26T18:24:16Z

cmd/kubeadm/app/util/config/masterconfig.go

+		cfg.CIImageRepository = kubeadmconstants.DefaultCIImageRepository
+	}
+
+	// Validate version argument


Parse the version argument and resolve possible CI version labels

luxas · 2017-09-26T18:27:43Z

cmd/kubeadm/app/cmd/upgrade/apply.go

-	if !strings.HasPrefix(flags.newK8sVersionStr, "v") {
-		flags.newK8sVersionStr = fmt.Sprintf("v%s", flags.newK8sVersionStr)
+	if len(flags.newK8sVersionStr) == 0 {
+		return fmt.Errorf("Version string can't be empty")


error msgs should start with lowercase

luxas · 2017-09-26T18:27:55Z

cmd/kubeadm/app/cmd/upgrade/apply.go

+	flags.newK8sVersionStr = internalcfg.KubernetesVersion
+	k8sVer, err := version.ParseSemantic(flags.newK8sVersionStr)
+	if err != nil {
+		return fmt.Errorf("Unable parse normalized version %q as a semantic version", flags.newK8sVersionStr)


kad · 2017-09-26T18:40:03Z

thx, will update.

kubeadm upgrade apply now is able to utilize all possible combinations of version argument, including labels (latest, stable-1.8, ci/latest-1.9) as well as specific builds (v1.8.0-rc.1, ci/v1.9.0-alpha.1.123_01234567889) As side effect, specifying exact build to deploy from CI area is now also possible in kubeadm init command. Fixes: kubernetes/kubeadm#451

kad · 2017-09-26T19:31:07Z

ok, unit test added, all other typos should to be fixed now.

luxas

/lgtm

Thanks 🎉!

k8s-github-robot · 2017-09-26T19:38:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kad, luxas

Associated issue: 451

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

~~cmd/kubeadm/OWNERS~~ [luxas]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

k8s-github-robot · 2017-09-27T15:14:38Z

/test all [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2017-09-27T16:13:25Z

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

k8s-ci-robot · 2017-09-27T16:18:27Z

@kad: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
pull-kubernetes-e2e-gce-bazel	`09e59cf`	link	`/test pull-kubernetes-e2e-gce-bazel`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 26, 2017

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 26, 2017

k8s-github-robot assigned errordeveloper and luxas Sep 26, 2017

k8s-github-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 26, 2017

k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 26, 2017

luxas reviewed Sep 26, 2017

View reviewed changes

kad force-pushed the upgrade-ux branch from a322cc7 to b93287f Compare September 26, 2017 19:24

kad force-pushed the upgrade-ux branch from b93287f to 09e59cf Compare September 26, 2017 19:28

luxas approved these changes Sep 26, 2017

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 26, 2017

k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 26, 2017

luxas mentioned this pull request Sep 27, 2017

Manually Validate Kubeadm 1.7 -> 1.8 Upgrade Path kubernetes/kubeadm#466

Closed

k8s-github-robot merged commit df569a3 into kubernetes:master Sep 27, 2017

xiangpengzhao mentioned this pull request Nov 13, 2017

Address markdown format symbols in PR release note block? kubernetes/sig-release#29

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to use version labels in kubeadm upgrade apply command. #53043

Allow to use version labels in kubeadm upgrade apply command. #53043

kad commented Sep 26, 2017 •

edited

Loading

k8s-ci-robot commented Sep 26, 2017

kad commented Sep 26, 2017

kad commented Sep 26, 2017

luxas commented Sep 26, 2017

luxas left a comment

luxas Sep 26, 2017

kad Sep 26, 2017

luxas Sep 26, 2017

luxas Sep 26, 2017

luxas Sep 26, 2017

luxas Sep 26, 2017

luxas Sep 26, 2017

kad commented Sep 26, 2017

kad commented Sep 26, 2017

luxas left a comment

k8s-github-robot commented Sep 26, 2017

k8s-github-robot commented Sep 27, 2017

k8s-github-robot commented Sep 27, 2017

k8s-ci-robot commented Sep 27, 2017

Allow to use version labels in kubeadm upgrade apply command. #53043

Allow to use version labels in kubeadm upgrade apply command. #53043

Conversation

kad commented Sep 26, 2017 • edited Loading

k8s-ci-robot commented Sep 26, 2017

kad commented Sep 26, 2017

kad commented Sep 26, 2017

luxas commented Sep 26, 2017

luxas left a comment

Choose a reason for hiding this comment

luxas Sep 26, 2017

Choose a reason for hiding this comment

kad Sep 26, 2017

Choose a reason for hiding this comment

luxas Sep 26, 2017

Choose a reason for hiding this comment

luxas Sep 26, 2017

Choose a reason for hiding this comment

luxas Sep 26, 2017

Choose a reason for hiding this comment

luxas Sep 26, 2017

Choose a reason for hiding this comment

luxas Sep 26, 2017

Choose a reason for hiding this comment

kad commented Sep 26, 2017

kad commented Sep 26, 2017

luxas left a comment

Choose a reason for hiding this comment

k8s-github-robot commented Sep 26, 2017

k8s-github-robot commented Sep 27, 2017

k8s-github-robot commented Sep 27, 2017

k8s-ci-robot commented Sep 27, 2017

kad commented Sep 26, 2017 •

edited

Loading