Fix: Cluster deletion is skipped if timeout happens in WaitUntilClust…

…erIsReady (#227) Signed-off-by: Parthvi Vala <parthvi.vala@suse.com>
rancher · Dec 18, 2024 · df9e5e2 · df9e5e2
1 parent cfd66eb
commit df9e5e2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hosted/helpers/helper_common.go b/hosted/helpers/helper_common.go
@@ -139,14 +139,14 @@ func WaitUntilClusterIsReady(cluster *management.Cluster, client *rancher.Client
 	opts := metav1.ListOptions{FieldSelector: "metadata.name=" + cluster.ID, TimeoutSeconds: &defaults.WatchTimeoutSeconds}
 	watchInterface, err := client.GetManagementWatchInterface(management.ClusterType, opts)
 	if err != nil {
-		return nil, err
+		return cluster, err
 	}
 
 	watchFunc := shepherdclusters.IsHostedProvisioningClusterReady
 
 	err = wait.WatchWait(watchInterface, watchFunc)
 	if err != nil {
-		return nil, err
+		return cluster, err
 	}
 	var updatedCluster *management.Cluster
 	updatedCluster, err = client.Management.Cluster.ByID(cluster.ID)