From b7b10fc8993fb4c254308f08234d7f06ae4394df Mon Sep 17 00:00:00 2001
From: SataQiu <1527062125@qq.com>
Date: Fri, 15 Nov 2019 22:54:05 +0800
Subject: [PATCH] kubeadm: reset raises warnings if it cannot delete folders

---
 cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go | 2 +-
 cmd/kubeadm/app/cmd/reset.go                    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go
index 319da9cdd37..d1bdc9a7503 100644
--- a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go
+++ b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go
@@ -128,7 +128,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
 	fmt.Printf("[reset] Deleting contents of config directories: %v\n", dirsToClean)
 	for _, dir := range dirsToClean {
 		if err := CleanDir(dir); err != nil {
-			klog.Warningf("[reset] Failed to remove directory: %q [%v]\n", dir, err)
+			klog.Warningf("[reset] Failed to delete contents of %q directory: %v", dir, err)
 		}
 	}
 
diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go
index b49600af0d7..e9956c830e4 100644
--- a/cmd/kubeadm/app/cmd/reset.go
+++ b/cmd/kubeadm/app/cmd/reset.go
@@ -215,8 +215,10 @@ func NewCmdReset(in io.Reader, out io.Writer, resetOptions *resetOptions) *cobra
 func cleanDirs(data *resetData) {
 	fmt.Printf("[reset] Deleting contents of stateful directories: %v\n", data.dirsToClean)
 	for _, dir := range data.dirsToClean {
-		klog.V(1).Infof("[reset] Deleting content of %s", dir)
-		phases.CleanDir(dir)
+		klog.V(1).Infof("[reset] Deleting contents of %s", dir)
+		if err := phases.CleanDir(dir); err != nil {
+			klog.Warningf("[reset] Failed to delete contents of %q directory: %v", dir, err)
+		}
 	}
 }