Fix cluster_wide_install test

k8ssandra · Feb 18, 2025 · 990d1a1 · 990d1a1
1 parent 2f22b49
commit 990d1a1
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/pkg/reconciliation/reconcile_datacenter.go b/pkg/reconciliation/reconcile_datacenter.go
@@ -84,17 +84,24 @@ func (rc *ReconciliationContext) ProcessDeletion() result.ReconcileResult {
 			return result.Error(err)
 		}
 
-		if res := rc.CheckRackCreation(); res.Completed() {
-			return res
-		}
-
 		waitingForRackScale := false
-		for _, sts := range rc.statefulSets {
-			currentReplicas := int(*sts.Spec.Replicas)
-			if currentReplicas > 0 {
-				waitingForRackScale = true
-				if err := rc.UpdateRackNodeCount(sts, 0); err != nil {
-					return result.Error(err)
+		for _, rackInfo := range rc.desiredRackInformation {
+			sts, statefulSetFound, err := rc.GetStatefulSetForRack(rackInfo)
+			if err != nil {
+				rc.ReqLogger.Error(
+					err,
+					"Could not locate statefulSet for",
+					"Rack", rackInfo.RackName)
+				return result.Error(err)
+			}
+
+			if statefulSetFound {
+				currentReplicas := int(*sts.Spec.Replicas)
+				if currentReplicas > 0 {
+					waitingForRackScale = true
+					if err := rc.UpdateRackNodeCount(sts, 0); err != nil {
+						return result.Error(err)
+					}
 				}
 			}
 		}