Merge pull request #7024 from muraee/fix-OCPBUGS-62949

OCPBUGS-62949: fix(resources): prevent indefinite blocking on cloud resource cleanup during deletion

Author: openshift-merge-bot[bot]

api/hypershift/v1beta1/hostedcluster_conditions.go

@@ -249,6 +249,8 @@ const (
 	KubeVirtNodesLiveMigratableReason = "KubeVirtNodesNotLiveMigratable"
 
 	RecoveryFinishedReason = "RecoveryFinished"
+
+	CloudResourcesCleanupSkippedReason = "CloudResourcesCleanupSkipped"
 )
 
 // Messages.

control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go

@@ -2796,6 +2796,13 @@ func (r *HostedControlPlaneReconciler) removeCloudResources(ctx context.Context,
 		return true, nil
 	}
 
+	// check if cleanup has been skipped
+	if resourcesDestroyedCond != nil && resourcesDestroyedCond.Status == metav1.ConditionFalse &&
+		resourcesDestroyedCond.Reason == string(hyperv1.CloudResourcesCleanupSkippedReason) {
+		log.Info("Cleanup has been skipped", "reason", resourcesDestroyedCond.Message)
+		return true, nil
+	}
+
 	// if CVO has been scaled down, we're waiting for resources to be destroyed
 	cvoScaledDownCond := meta.FindStatusCondition(hcp.Status.Conditions, string(hyperv1.CVOScaledDown))
 	if cvoScaledDownCond != nil && cvoScaledDownCond.Status == metav1.ConditionTrue {