From f946a2500b9f5b4b1d661eacaffbf4c25932f361 Mon Sep 17 00:00:00 2001 From: Panagiotis Georgiadis Date: Thu, 1 Aug 2019 16:40:47 +0200 Subject: [PATCH] kubeadm reset: replace Errorf with Warningf --- cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go index 410cc5639fb..df58fbc73d5 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go +++ b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go @@ -79,7 +79,7 @@ func runCleanupNode(c workflow.RunData) error { klog.V(1).Info("[reset] Removing Kubernetes-managed containers") if err := removeContainers(utilsexec.New(), r.CRISocketPath()); err != nil { - klog.Errorf("[reset] Failed to remove containers: %v", err) + klog.Warningf("[reset] Failed to remove containers: %v\n", err) } r.AddDirsToClean("/etc/cni/net.d", "/var/lib/dockershim", "/var/run/kubernetes", "/var/lib/cni") @@ -97,7 +97,7 @@ func runCleanupNode(c workflow.RunData) error { func absoluteKubeletRunDirectory() (string, error) { absoluteKubeletRunDirectory, err := filepath.EvalSymlinks(kubeadmconstants.KubeletRunDirectory) if err != nil { - klog.Errorf("[reset] Failed to evaluate the %q directory. Skipping its unmount and cleanup: %v", kubeadmconstants.KubeletRunDirectory, err) + klog.Warningf("[reset] Failed to evaluate the %q directory. Skipping its unmount and cleanup: %v\n", kubeadmconstants.KubeletRunDirectory, err) return "", err } @@ -106,7 +106,7 @@ func absoluteKubeletRunDirectory() (string, error) { klog.V(1).Infof("[reset] Executing command %q", umountDirsCmd) umountOutputBytes, err := exec.Command("sh", "-c", umountDirsCmd).Output() if err != nil { - klog.Errorf("[reset] Failed to unmount mounted directories in %s: %s\n", kubeadmconstants.KubeletRunDirectory, string(umountOutputBytes)) + klog.Warningf("[reset] Failed to unmount mounted directories in %s: %s\n", kubeadmconstants.KubeletRunDirectory, string(umountOutputBytes)) } return absoluteKubeletRunDirectory, nil } @@ -132,7 +132,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.Errorf("[reset] Failed to remove directory: %q [%v]\n", dir, err) + klog.Warningf("[reset] Failed to remove directory: %q [%v]\n", dir, err) } } @@ -146,7 +146,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) { fmt.Printf("[reset] Deleting files: %v\n", filesToClean) for _, path := range filesToClean { if err := os.RemoveAll(path); err != nil { - klog.Errorf("[reset] Failed to remove file: %q [%v]\n", path, err) + klog.Warningf("[reset] Failed to remove file: %q [%v]\n", path, err) } } }