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

Clean host after removal

Browse Source 
return error in dialer
This commit is contained in:
galal-hussein
2017-11-26 20:23:06 +02:00
parent afe1293d31
commit 3f7f93c2ab
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cluster/cluster.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/rancher/rke/services"
"github.com/rancher/types/apis/cluster.cattle.io/v1"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
yaml "gopkg.in/yaml.v2"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/util/cert"
@@ -137,6 +138,7 @@ func ReconcileCluster(kubeCluster, currentCluster *Cluster) error {
if err != nil {
return fmt.Errorf("Failed to initialize new kubernetes client: %v", err)
}
key, _ := checkEncryptedKey(kubeCluster.SSHKeyPath)
logrus.Infof("[reconcile] Check Control plane hosts to be deleted")
cpToDelete := hosts.GetToDeleteHosts(currentCluster.ControlPlaneHosts, kubeCluster.ControlPlaneHosts)
@@ -144,6 +146,11 @@ func ReconcileCluster(kubeCluster, currentCluster *Cluster) error {
if err := hosts.DeleteNode(&toDeleteHost, kubeClient); err != nil {
return fmt.Errorf("Failed to delete controlplane node %s from cluster", toDeleteHost.AdvertisedHostname)
}
// attempting to clean up the host
if err := reconcileHostCleaner(toDeleteHost, key, false); err != nil {
logrus.Warnf("[reconcile] Couldn't clean up controlplane node [%s]: %v", toDeleteHost.AdvertisedHostname, err)
continue
}
}
logrus.Infof("[reconcile] Check worker hosts to be deleted")
@@ -152,6 +159,11 @@ func ReconcileCluster(kubeCluster, currentCluster *Cluster) error {
if err := hosts.DeleteNode(&toDeleteHost, kubeClient); err != nil {
return fmt.Errorf("Failed to delete worker node %s from cluster", toDeleteHost.AdvertisedHostname)
}
// attempting to clean up the host
if err := reconcileHostCleaner(toDeleteHost, key, true); err != nil {
logrus.Warnf("[reconcile] Couldn't clean up worker node [%s]: %v", toDeleteHost.AdvertisedHostname, err)
continue
}
}
// Rolling update on change for nginx Proxy
@@ -167,6 +179,23 @@ func ReconcileCluster(kubeCluster, currentCluster *Cluster) error {
return nil
}
func reconcileHostCleaner(toDeleteHost hosts.Host, key ssh.Signer, worker bool) error {
if err := toDeleteHost.TunnelUp(key); err != nil {
return fmt.Errorf("Not able to reach the host: %v", err)
}
if err := services.RemoveControlPlane([]hosts.Host{toDeleteHost}); err != nil {
return fmt.Errorf("Couldn't remove control plane: %v", err)
}
if err := services.RemoveWorkerPlane(nil, []hosts.Host{toDeleteHost}); err != nil {
return fmt.Errorf("Couldn't remove worker plane: %v", err)
}
if err := toDeleteHost.CleanUp(); err != nil {
return fmt.Errorf("Not able to clean the host: %v", err)
}
return nil
}
func rebuildLocalAdminConfig(kubeCluster *Cluster) error {
logrus.Infof("[reconcile] Rebuilding and update local kube config")
currentKubeConfig := kubeCluster.Certificates[pki.KubeAdminCommonName]