Merge pull request #57784 from rajansandeep/upgradenits

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix `kubeadm upgrade` error while CoreDNS is installed **What this PR does / why we need it**: In the scenario when I have CoreDNS installed via `kubeadm init` and I want to continue using CoreDNS after `kubeadm upgrade`, the upgrade is unsuccessful and it gives an error. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes kubernetes/kubeadm#641 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57784 from rajansandeep/upgradenits
6244ff36 · Kubernetes Submit Queue · GitHub · 50a641d3 · 9d7b7465 · 6244ff36
Unverified Commit 6244ff36 authored Jan 08, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

postupgrade.go cmd/kubeadm/app/phases/upgrade/postupgrade.go +7 -2

No files found.
--- 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