scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99586 from zgfh/update-kubeadm-upgrade-description

Browse Source 
update kubeadm upgrade description
This commit is contained in:
Kubernetes Prow Robot
2021-03-01 18:19:41 -08:00
committed by GitHub
parent 5bf1c184e1 8ffdc674b2
commit 33035a3fdf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/upgrade/compute.go
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) {