From 05f9e500ad244e4847f7a87e325530aa41ef4a32 Mon Sep 17 00:00:00 2001 From: pacoxu Date: Wed, 25 Nov 2020 21:07:25 +0800 Subject: [PATCH] fix kubeadm upgrade dns check preflight Signed-off-by: pacoxu --- cmd/kubeadm/app/phases/upgrade/preflight.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/preflight.go b/cmd/kubeadm/app/phases/upgrade/preflight.go index 1356d5569fb..536c60ab64b 100644 --- a/cmd/kubeadm/app/phases/upgrade/preflight.go +++ b/cmd/kubeadm/app/phases/upgrade/preflight.go @@ -126,17 +126,17 @@ func checkMigration(client clientset.Interface) error { // checkKubeDNSConfigMap checks if the translation of kube-dns to CoreDNS ConfigMap is supported func checkKubeDNSConfigMap(client clientset.Interface) error { kubeDNSConfigMap, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(context.TODO(), kubeadmconstants.KubeDNSConfigMap, metav1.GetOptions{}) - if err != nil && !apierrors.IsNotFound(err) { + if err != nil { + if apierrors.IsNotFound(err) { + return nil + } return err } - if kubeDNSConfigMap == nil { - return nil - } if _, ok := kubeDNSConfigMap.Data["federations"]; ok { klog.V(1).Infoln("CoreDNS no longer supports Federation and " + "hence will not translate the federation data from kube-dns to CoreDNS ConfigMap") - return errors.Wrap(err, "kube-dns Federation data will not be translated") + return errors.New("kube-dns Federation data will not be translated") } return nil }