From 9d7b74658dcd658fb070f009ad153423c20f11ef Mon Sep 17 00:00:00 2001 From: Sandeep Rajan Date: Wed, 3 Jan 2018 14:45:17 +0530 Subject: [PATCH] include kube-dns deployment check ignore 404 error --- cmd/kubeadm/app/phases/upgrade/postupgrade.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go index f18c2e23f79..a7e98be66ac 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade.go @@ -21,6 +21,7 @@ import ( "os" "time" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/errors" clientset "k8s.io/client-go/kubernetes" @@ -122,9 +123,13 @@ func removeOldKubeDNSDeploymentIfCoreDNSIsUsed(cfg *kubeadmapi.MasterConfigurati return err } if coreDNSDeployment.Status.ReadyReplicas == 0 { - return fmt.Errorf("the CodeDNS deployment isn't ready yet") + return fmt.Errorf("the CoreDNS deployment isn't ready yet") } - return apiclient.DeleteDeploymentForeground(client, metav1.NamespaceSystem, kubeadmconstants.KubeDNS) + err = apiclient.DeleteDeploymentForeground(client, metav1.NamespaceSystem, kubeadmconstants.KubeDNS) + if err != nil && !apierrors.IsNotFound(err) { + return err + } + return nil }, 10) } return nil