FIX: Catch ssh error

Fred78290 · Aug 13, 2024 · 0029af3 · 0029af3
1 parent 58107bd
commit 0029af3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/providers/providers_test.go b/providers/providers_test.go
@@ -128,7 +128,9 @@ func (config *configurationTest) WaitSSHReady(nodename, address string) error {
 	return context.PollImmediate(time.Second, time.Duration(config.appConfig.SSH.WaitSshReadyInSeconds)*time.Second, func() (done bool, err error) {
 		// Set hostname
 		if _, err := utils.Sudo(&config.appConfig.SSH, address, time.Second, fmt.Sprintf("hostnamectl set-hostname %s", nodename)); err != nil {
-			if strings.HasSuffix(err.Error(), "connection refused") || strings.HasSuffix(err.Error(), "i/o timeout") {
+			errMessage := err.Error()
+
+			if strings.HasSuffix(errMessage, "connection refused") || strings.HasSuffix(errMessage, "i/o timeout") || strings.Contains(errMessage, "handshake failed: EOF") || strings.Contains(errMessage, "connect: no route to host") {
 				return false, nil
 			}
 

diff --git a/server/node.go b/server/node.go
@@ -302,7 +302,9 @@ func (vm *AutoScalerServerNode) WaitSSHReady(nodename, address string) error {
 	return context.PollImmediate(time.Second, time.Duration(config.SSH.WaitSshReadyInSeconds)*time.Second, func() (bool, error) {
 		// Set hostname
 		if _, err := utils.Sudo(config.SSH, address, time.Second, fmt.Sprintf("hostnamectl set-hostname %s", nodename)); err != nil {
-			if strings.HasSuffix(err.Error(), "connection refused") || strings.HasSuffix(err.Error(), "i/o timeout") || strings.Contains(err.Error(), "handshake failed") || strings.Contains(err.Error(), "connect: no route to host") {
+			errMessage := err.Error()
+
+			if strings.HasSuffix(errMessage, "connection refused") || strings.HasSuffix(errMessage, "i/o timeout") || strings.Contains(errMessage, "handshake failed: EOF") || strings.Contains(errMessage, "connect: no route to host") {
 				return false, nil
 			}
 
@@ -663,7 +665,7 @@ func (vm *AutoScalerServerNode) deleteVM(c client.ClientGenerator) error {
 			}
 
 			if err = vm.getKubernetesProvider().PrepareNodeDeletion(c, powered); err != nil {
-				glog.Errorf(constantes.ErrPrepareNodeDeletionFailed, vm.NodeName, err)
+				glog.Warnf(constantes.ErrPrepareNodeDeletionFailed, vm.NodeName, err)
 			}
 
 			if status.Powered() {