From c825e8ec16482ebbefc3ae96a26f4dcf924e750c Mon Sep 17 00:00:00 2001
From: blade <416435596@qq.com>
Date: Thu, 12 Dec 2019 20:20:29 +0800
Subject: [PATCH] return success if cordon node by replace

---
 staging/src/k8s.io/kubectl/pkg/drain/default.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/staging/src/k8s.io/kubectl/pkg/drain/default.go b/staging/src/k8s.io/kubectl/pkg/drain/default.go
index 3df949f0e8a..a6b005de8ed 100644
--- a/staging/src/k8s.io/kubectl/pkg/drain/default.go
+++ b/staging/src/k8s.io/kubectl/pkg/drain/default.go
@@ -58,11 +58,11 @@ func RunCordonOrUncordon(drainer *Helper, node *corev1.Node, desired bool) error
 	}
 
 	err, patchErr := c.PatchOrReplace(drainer.Client, false)
-	if patchErr != nil {
-		return patchErr
-	}
 	if err != nil {
-		return err
+		if patchErr != nil {
+			return fmt.Errorf("cordon error: %s; merge patch error: %s", err.Error(), patchErr.Error())
+		}
+		return fmt.Errorf("cordon error: %s", err.Error())
 	}
 
 	return nil