From 00552765f2bc4042f5f9c4a48ecdeee70b68ae86 Mon Sep 17 00:00:00 2001 From: Xianglin Gao Date: Wed, 4 Jul 2018 15:53:29 +0800 Subject: [PATCH] add test case Signed-off-by: Xianglin Gao --- cmd/kubeadm/app/cmd/upgrade/plan.go | 9 +++++++-- cmd/kubeadm/app/cmd/upgrade/plan_test.go | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/plan.go b/cmd/kubeadm/app/cmd/upgrade/plan.go index aa2b20a9b18..af0f46929ec 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan.go @@ -21,6 +21,7 @@ import ( "io" "os" "sort" + "strings" "text/tabwriter" "github.com/golang/glog" @@ -156,7 +157,11 @@ func printAvailableUpgrades(upgrades []upgrade.Upgrade, w io.Writer, isExternalE UnstableVersionFlag := "" if len(newK8sVersion.PreRelease()) != 0 { - UnstableVersionFlag = "--allow-experimental-upgrades" + if strings.HasPrefix(newK8sVersion.PreRelease(), "rc") { + UnstableVersionFlag = " --allow-release-candidate-upgrades" + } else { + UnstableVersionFlag = " --allow-experimental-upgrades" + } } if isExternalEtcd && upgrade.CanUpgradeEtcd() { @@ -238,7 +243,7 @@ func printAvailableUpgrades(upgrades []upgrade.Upgrade, w io.Writer, isExternalE fmt.Fprintln(w, "") fmt.Fprintln(w, "You can now apply the upgrade by executing the following command:") fmt.Fprintln(w, "") - fmt.Fprintf(w, "\tkubeadm upgrade apply %s %s\n", upgrade.After.KubeVersion, UnstableVersionFlag) + fmt.Fprintf(w, "\tkubeadm upgrade apply %s%s\n", upgrade.After.KubeVersion, UnstableVersionFlag) fmt.Fprintln(w, "") if upgrade.Before.KubeadmVersion != upgrade.After.KubeadmVersion { diff --git a/cmd/kubeadm/app/cmd/upgrade/plan_test.go b/cmd/kubeadm/app/cmd/upgrade/plan_test.go index f8513d6609c..9fcd83f4f11 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan_test.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan_test.go @@ -302,7 +302,7 @@ Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: - kubeadm upgrade apply v1.9.0-beta.1 + kubeadm upgrade apply v1.9.0-beta.1 --allow-experimental-upgrades Note: Before you can perform this upgrade, you have to update kubeadm to v1.9.0-beta.1. @@ -350,7 +350,7 @@ Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: - kubeadm upgrade apply v1.9.0-rc.1 + kubeadm upgrade apply v1.9.0-rc.1 --allow-release-candidate-upgrades Note: Before you can perform this upgrade, you have to update kubeadm to v1.9.0-rc.1.