rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-05 08:50:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #126 from galal-hussein/warning_on_remove

Browse Source 
Add replace fatal with warning when can't remove local kubeconfig
This commit is contained in:
Alena Prokharchyk
2017-12-08 23:48:15 -06:00
committed by GitHub
parent dd7396b72c 0bd70fcdeb
commit ead2709100
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/remove.go
View File

@@ -27,7 +27,8 @@ func (c *Cluster) ClusterRemove() error {
return err return err
} }
return pki.RemoveAdminConfig(c.LocalKubeConfigPath) pki.RemoveAdminConfig(c.LocalKubeConfigPath)
return nil
} }
func cleanUpHosts(cpHosts, workerHosts, etcdHosts []*hosts.Host, cleanerImage string) error { func cleanUpHosts(cpHosts, workerHosts, etcdHosts []*hosts.Host, cleanerImage string) error {

6
pki/deploy.go
View File

@@ -111,11 +111,11 @@ func DeployAdminConfig(kubeConfig, localConfigPath string) error {
return nil return nil
} }
func RemoveAdminConfig(localConfigPath string) error { func RemoveAdminConfig(localConfigPath string) {
logrus.Infof("Removing local admin Kubeconfig: %s", localConfigPath) logrus.Infof("Removing local admin Kubeconfig: %s", localConfigPath)
if err := os.Remove(localConfigPath); err != nil { 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") logrus.Infof("Local admin Kubeconfig removed successfully")
return nil
} }