Fix delete rosa-hcp

Signed-off-by: serngawy <[email protected]>

Author: serngawy

controlplane/rosa/controllers/rosacontrolplane_controller.go

@@ -481,29 +481,30 @@ func (r *ROSAControlPlaneReconciler) deleteMachinePools(ctx context.Context, ros
 	}
 
 	var errs []error
+	allMachinePoolDeleted := true
 	for id, mp := range machinePools {
 		if !mp.DeletionTimestamp.IsZero() {
 			continue
 		}
 		if err = rosaScope.Client.Delete(ctx, &machinePools[id]); err != nil {
 			errs = append(errs, err)
 		}
-	}
-
-	// Workaround the case where last machinePool cannot be deleted without deleting the ROSA controlplane.
-	// In Cluster API (CAPI), machine pools (MPs) are normally deleted before the control plane is removed.
-	// However, in ROSA-HCP, deleting the final MP results in an error because the control plane cannot exist without at least 1 MP.
-	// To handle this, when only one MP remains, we ignore the deletion error and proceed with deleting the control plane.
-	// Also OCM cascade delete the MPs when deleting control plane, so we are safe to ignore last MP and delete the control plane.
-	if len(errs) == 0 && len(machinePools) == 1 {
-		return true, nil
+		allMachinePoolDeleted = false
 	}
 
 	if len(errs) > 0 {
 		return false, kerrors.NewAggregate(errs)
 	}
 
-	return len(machinePools) == 0, nil
+	// Workaround: Handle the dependency issue between MachinePools and the ROSA control plane.
+	// In Cluster API (CAPI), MachinePools (MPs) are typically deleted before the control plane is deprovisioned.
+	// However, in ROSA-HCP, a cluster cannot exist without MachinePools, which causes an error when attempting
+	// to delete them first — preventing the ROSAControlPlane from being removed.
+	// To resolve this, we initiate the deletion of the MachinePool CRs, wait for one reconcile cycle,
+	// and then proceed to delete the ROSA-HCP control plane.
+	// OCM will automatically cascade the deletion of NodePools before the control plane is deleted.
+
+	return allMachinePoolDeleted, nil
 }
 
 func (r *ROSAControlPlaneReconciler) reconcileClusterVersion(rosaScope *scope.ROSAControlPlaneScope, ocmClient rosa.OCMClient, cluster *cmv1.Cluster) error {

exp/controllers/rosamachinepool_controller.go

@@ -131,6 +131,13 @@ func (r *ROSAMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	controlPlane := &rosacontrolplanev1.ROSAControlPlane{}
 	if err := r.Client.Get(ctx, controlPlaneKey, controlPlane); err != nil {
 		if apierrors.IsNotFound(err) && !rosaMachinePool.DeletionTimestamp.IsZero() {
+			// When the ROSAControlPlane is not found and the ROSAMachinePool CR is marked for deletion,
+			// it indicates that the ROSAControlPlane (and its associated NodePools) has already been deleted,
+			// while the ROSAMachinePool remains pending — since a ROSA-HCP cluster cannot exist without a NodePool.
+			// To handle this scenario, we trigger deletion of the ROSAControlPlane CR to initiate cleanup of the ROSA-HCP,
+			// relying on OCM to cascade-delete the related NodePools.
+			// Note: This state should rarely occur. However, during smoke tests, the ROSAMachinePool reconcile cycle
+			// may occasionally lag behind the deletion of the NodePools and ROSAControlPlane.
 			log.Info("RosaControlPlane not found, RosaMachinePool is deleted")
 			patchHelper, err := patch.NewHelper(rosaMachinePool, r.Client)
 			if err != nil {