github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

remove redundant code

Browse Source
This commit is contained in:
caodonghui 2021-06-04 17:56:46 +08:00
parent 5c137f1af9
commit 812a04539c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/upgrade/compute.go
View File

@ -245,12 +245,10 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
// Default to assume that the experimental version to show is the unstable one // Default to assume that the experimental version to show is the unstable one
unstableKubeVersion := latestVersionStr unstableKubeVersion := latestVersionStr
unstableKubeDNSVersion := kubeadmconstants.CoreDNSVersion
// Ẃe should not display alpha.0. The previous branch's beta/rc versions are more relevant due how the kube branching process works. // Ẃe should not display alpha.0. The previous branch's beta/rc versions are more relevant due how the kube branching process works.
if latestVersion.PreRelease() == "alpha.0" { if latestVersion.PreRelease() == "alpha.0" {
unstableKubeVersion = previousBranchLatestVersionStr unstableKubeVersion = previousBranchLatestVersionStr
unstableKubeDNSVersion = kubeadmconstants.CoreDNSVersion
} }
upgrades = append(upgrades, Upgrade{ upgrades = append(upgrades, Upgrade{
@ -258,7 +256,7 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
Before: beforeState, Before: beforeState,
After: ClusterState{ After: ClusterState{
KubeVersion: unstableKubeVersion, KubeVersion: unstableKubeVersion,
DNSVersion: unstableKubeDNSVersion, DNSVersion: kubeadmconstants.CoreDNSVersion,
KubeadmVersion: unstableKubeVersion, KubeadmVersion: unstableKubeVersion,
EtcdVersion: getSuggestedEtcdVersion(externalEtcd, unstableKubeVersion), EtcdVersion: getSuggestedEtcdVersion(externalEtcd, unstableKubeVersion),
// KubeletVersions is unset here as it is not used anywhere in .After // KubeletVersions is unset here as it is not used anywhere in .After