improve delete node command

airfocusio · Feb 24, 2022 · 6d30f84 · 6d30f84
1 parent 6ed3648
commit 6d30f84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/internal/clients/hcloud.go b/internal/clients/hcloud.go
@@ -283,7 +283,7 @@ func HcloudCreateServerFromImage(cl *cluster.Cluster, network *hcloud.Network, p
 			return err
 		}
 		if server != nil && server.Status != hcloud.ServerStatusOff {
-			return fmt.Errorf("server is not yet turned off")
+			return fmt.Errorf("server is not yet shut down")
 		}
 		return nil
 	})

diff --git a/internal/delete_node.go b/internal/delete_node.go
@@ -76,21 +76,14 @@ func (cmd *DeleteNodeCommand) Run(logger *utils.Logger, dir string) error {
 		return err
 	}
 
-	logger.Debug.Printf("Shutting down server\n")
-	err = utils.Retry(cl.Logger, func() error {
-		_, _, err = cl.Client.Server.Shutdown(*cl.Ctx, server)
-		return err
-	})
-	if err != nil {
-		return nil
-	}
+	logger.Debug.Printf("Waiting for server to shut down talos\n")
 	err = utils.RetrySlow(cl.Logger, func() error {
 		server, _, err := cl.Client.Server.GetByID(*cl.Ctx, server.ID)
 		if err != nil {
 			return err
 		}
 		if server != nil && server.Status != hcloud.ServerStatusOff {
-			return fmt.Errorf("server is not yet turned off")
+			return fmt.Errorf("server is not yet shut down")
 		}
 		return nil
 	})