From 0bd70fcdebc7d58f528626dc22d4a3240ad05507 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Sat, 9 Dec 2017 01:38:44 +0200 Subject: [PATCH] Add replace fatal with warning when can't remove local kubeconfig --- cluster/remove.go | 3 ++- pki/deploy.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/remove.go b/cluster/remove.go index 499e981b..5aa58246 100644 --- a/cluster/remove.go +++ b/cluster/remove.go @@ -27,7 +27,8 @@ func (c *Cluster) ClusterRemove() error { return err } - return pki.RemoveAdminConfig(c.LocalKubeConfigPath) + pki.RemoveAdminConfig(c.LocalKubeConfigPath) + return nil } func cleanUpHosts(cpHosts, workerHosts, etcdHosts []*hosts.Host, cleanerImage string) error { diff --git a/pki/deploy.go b/pki/deploy.go index a8ea057d..c94e240c 100644 --- a/pki/deploy.go +++ b/pki/deploy.go @@ -111,11 +111,11 @@ func DeployAdminConfig(kubeConfig, localConfigPath string) error { return nil } -func RemoveAdminConfig(localConfigPath string) error { +func RemoveAdminConfig(localConfigPath string) { logrus.Infof("Removing local admin Kubeconfig: %s", localConfigPath) if err := os.Remove(localConfigPath); err != nil { - return fmt.Errorf("Failed to remove local admin Kubeconfig file: %v", err) + logrus.Warningf("Failed to remove local admin Kubeconfig file: %v", err) + return } logrus.Infof("Local admin Kubeconfig removed successfully") - return nil }