rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-05-10 09:24:32 +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

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]

6
hosts/dialer.go
View File

@ -25,19 +25,19 @@ func (d *dialer) Dial(network, addr string) (net.Conn, error) {
// Build SSH client configuration
cfg, err := makeSSHConfig(d.host.User, d.signer)
if err != nil {
logrus.Fatalf("Error configuring SSH: %v", err)
return nil, fmt.Errorf("Error configuring SSH: %v", err)
}
// Establish connection with SSH server
conn, err := ssh.Dial("tcp", sshAddr, cfg)
if err != nil {
logrus.Fatalf("Error establishing SSH connection: %v", err)
return nil, fmt.Errorf("Error establishing SSH connection: %v", err)
}
if len(d.host.DockerSocket) == 0 {
d.host.DockerSocket = "/var/run/docker.sock"
}
remote, err := conn.Dial("unix", d.host.DockerSocket)
if err != nil {
logrus.Fatalf("Error connecting to Docker socket on host [%s]: %v", d.host.AdvertisedHostname, err)
return nil, fmt.Errorf("Error connecting to Docker socket on host [%s]: %v", d.host.AdvertisedHostname, err)
}
return remote, err
}

8
hosts/hosts.go
View File

@ -28,7 +28,7 @@ const (
)
func (h *Host) CleanUp() error {
logrus.Infof("[down] Cleaning up host [%s]", h.AdvertisedHostname)
logrus.Infof("[hosts] Cleaning up host [%s]", h.AdvertisedHostname)
toCleanDirs := []string{
ToCleanEtcdDir,
ToCleanSSLDir,
@ -36,7 +36,7 @@ func (h *Host) CleanUp() error {
ToCleanCNIBin,
ToCleanCalicoRun,
}
logrus.Infof("[down] Running cleaner container on host [%s]", h.AdvertisedHostname)
logrus.Infof("[hosts] Running cleaner container on host [%s]", h.AdvertisedHostname)
imageCfg, hostCfg := buildCleanerConfig(h, toCleanDirs)
if err := docker.DoRunContainer(h.DClient, imageCfg, hostCfg, CleanerContainerName, h.AdvertisedHostname, CleanerContainerName); err != nil {
return err
@ -46,11 +46,11 @@ func (h *Host) CleanUp() error {
return err
}
logrus.Infof("[down] Removing cleaner container on host [%s]", h.AdvertisedHostname)
logrus.Infof("[hosts] Removing cleaner container on host [%s]", h.AdvertisedHostname)
if err := docker.RemoveContainer(h.DClient, h.AdvertisedHostname, CleanerContainerName); err != nil {
return err
}
logrus.Infof("[down] Successfully cleaned up host [%s]", h.AdvertisedHostname)
logrus.Infof("[hosts] Successfully cleaned up host [%s]", h.AdvertisedHostname)
return nil
}