set status.phase to deleting on delete

Signed-off-by: rakeshgm <[email protected]>
nirs · May 6, 2024 · 825655f · 825655f
1 parent c35f13e
commit 825655f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/api/v1alpha1/drplacementcontrol_types.go b/api/v1alpha1/drplacementcontrol_types.go
@@ -61,6 +61,8 @@ const (
 
 	// Relocated, state recorded in
 	Relocated = DRState("Relocated")
+
+	Deleting = DRState("Deleting")
 )
 
 const (
@@ -114,6 +116,7 @@ const (
 	ProgressionEnsuringVolSyncSetup                = ProgressionStatus("EnsuringVolSyncSetup")
 	ProgressionSettingupVolsyncDest                = ProgressionStatus("SettingUpVolSyncDest")
 	ProgressionDeleting                            = ProgressionStatus("Deleting")
+	ProgressionDeleted                             = ProgressionStatus("Deleted")
 	ProgressionActionPaused                        = ProgressionStatus("Paused")
 )
 

diff --git a/controllers/drplacementcontrol_controller.go b/controllers/drplacementcontrol_controller.go
@@ -736,7 +736,7 @@ func (r *DRPlacementControlReconciler) Reconcile(ctx context.Context, req ctrl.R
 		if err != nil {
 			logger.Info(fmt.Sprintf("Error in deleting DRPC: (%v)", err))
 
-			statusErr := r.setProgressionAndUpdate(ctx, drpc, rmn.ProgressionDeleting)
+			statusErr := r.setDeletionStatusAndUpdate(ctx, drpc)
 			if statusErr != nil {
 				err = fmt.Errorf("drpc deletion failed: %w and status update failed: %w", err, statusErr)
 			}
@@ -808,10 +808,12 @@ func (r *DRPlacementControlReconciler) Reconcile(ctx context.Context, req ctrl.R
 	return r.reconcileDRPCInstance(d, logger)
 }
 
-func (r *DRPlacementControlReconciler) setProgressionAndUpdate(
-	ctx context.Context, drpc *rmn.DRPlacementControl, progressionStatus rmn.ProgressionStatus,
+func (r *DRPlacementControlReconciler) setDeletionStatusAndUpdate(
+	ctx context.Context, drpc *rmn.DRPlacementControl,
 ) error {
-	updated := updateDRPCProgression(drpc, progressionStatus, r.Log)
+	updated := updateDRPCProgression(drpc, rmn.ProgressionDeleting, r.Log)
+	drpc.Status.Phase = rmn.Deleting
+	drpc.Status.ObservedGeneration = drpc.Generation
 
 	if updated {
 		if err := r.Status().Update(ctx, drpc); err != nil {
@@ -1175,6 +1177,7 @@ func (r *DRPlacementControlReconciler) processDeletion(ctx context.Context,
 		}
 	}
 
+	updateDRPCProgression(drpc, rmn.ProgressionDeleted, r.Log)
 	// Remove DRPCFinalizer from DRPC.
 	controllerutil.RemoveFinalizer(drpc, DRPCFinalizer)