update kubeadm upgrade description

Signed-off-by: Alan Zhu <zg.zhu@daocloud.io>
This commit is contained in:
Alan Zhu 2021-03-01 20:42:57 +08:00
parent 793390e13b
commit 8ffdc674b2

View File

@ -225,11 +225,11 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
minorUnstable := latestVersion.Components()[1] minorUnstable := latestVersion.Components()[1]
// Get and output the current latest unstable version // Get and output the current latest unstable version
previousBranch := fmt.Sprintf("latest-1.%d", minorUnstable-1) previousBranch := fmt.Sprintf("latest-1.%d", minorUnstable-1)
previousBranchLatestVersionStr, previousBranchLatestVersion, err := versionGetterImpl.VersionFromCILabel(previousBranch, "") previousBranchLatestVersionStr, previousBranchLatestVersion, err := versionGetterImpl.VersionFromCILabel(previousBranch, "previous version")
if err != nil { if err != nil {
return upgrades, err return upgrades, err
} }
fmt.Printf("[upgrade/versions] Latest %s: %s\n", "", previousBranchLatestVersionStr) fmt.Printf("[upgrade/versions] Latest %s: %s\n", "previous version", previousBranchLatestVersionStr)
// If that previous latest version is an RC, RCs are allowed and the cluster version is lower than the RC version, show the upgrade // If that previous latest version is an RC, RCs are allowed and the cluster version is lower than the RC version, show the upgrade
if rcUpgradesAllowed && rcUpgradePossible(clusterVersion, previousBranchLatestVersion) { if rcUpgradesAllowed && rcUpgradePossible(clusterVersion, previousBranchLatestVersion) {