From 812a04539cc117e77cddc19319efe438ecaee055 Mon Sep 17 00:00:00 2001 From: caodonghui Date: Fri, 4 Jun 2021 17:56:46 +0800 Subject: [PATCH] remove redundant code --- cmd/kubeadm/app/phases/upgrade/compute.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/compute.go b/cmd/kubeadm/app/phases/upgrade/compute.go index d6ecc6fde91..eb8ddf2dcba 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute.go +++ b/cmd/kubeadm/app/phases/upgrade/compute.go @@ -245,12 +245,10 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA // Default to assume that the experimental version to show is the unstable one 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. if latestVersion.PreRelease() == "alpha.0" { unstableKubeVersion = previousBranchLatestVersionStr - unstableKubeDNSVersion = kubeadmconstants.CoreDNSVersion } upgrades = append(upgrades, Upgrade{ @@ -258,7 +256,7 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA Before: beforeState, After: ClusterState{ KubeVersion: unstableKubeVersion, - DNSVersion: unstableKubeDNSVersion, + DNSVersion: kubeadmconstants.CoreDNSVersion, KubeadmVersion: unstableKubeVersion, EtcdVersion: getSuggestedEtcdVersion(externalEtcd, unstableKubeVersion), // KubeletVersions is unset here as it is not used anywhere in .After