Add custom cleanup only when the NIM operator finalizer is present

Signed-off-by: Shiva Krishna, Merla <smerla@nvidia.com>

Author: shivamerla

internal/controller/nemo_datastore_controller.go

@@ -132,13 +132,13 @@ func (r *NemoDatastoreReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 	} else {
 		// The instance is being deleted
-		// Perform platform specific cleanup of resources
-		if err := r.cleanupNemoDatastore(ctx, NemoDatastore); err != nil {
-			r.GetEventRecorder().Eventf(NemoDatastore, corev1.EventTypeNormal, "Delete",
-				"NemoDatastore %s is being deleted", NemoDatastore.Name)
-			return ctrl.Result{}, err
-		}
 		if controllerutil.ContainsFinalizer(NemoDatastore, NemoDatastoreFinalizer) {
+			// Perform platform specific cleanup of resources
+			if err := r.cleanupNemoDatastore(ctx, NemoDatastore); err != nil {
+				r.GetEventRecorder().Eventf(NemoDatastore, corev1.EventTypeNormal, "Delete",
+					"NemoDatastore %s is being deleted", NemoDatastore.Name)
+				return ctrl.Result{}, err
+			}
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(NemoDatastore, NemoDatastoreFinalizer)
 			if err := r.Update(ctx, NemoDatastore); err != nil {

internal/controller/nemo_entitystore_controller.go

@@ -131,13 +131,13 @@ func (r *NemoEntitystoreReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 	} else {
 		// The instance is being deleted
-		// Perform platform specific cleanup of resources
-		if err := r.cleanupNemoEntitystore(ctx, NemoEntitystore); err != nil {
-			r.GetEventRecorder().Eventf(NemoEntitystore, corev1.EventTypeNormal, "Delete",
-				"NemoEntitystore %s is being deleted", NemoEntitystore.Name)
-			return ctrl.Result{}, err
-		}
 		if controllerutil.ContainsFinalizer(NemoEntitystore, NemoEntitystoreFinalizer) {
+			// Perform platform specific cleanup of resources
+			if err := r.cleanupNemoEntitystore(ctx, NemoEntitystore); err != nil {
+				r.GetEventRecorder().Eventf(NemoEntitystore, corev1.EventTypeNormal, "Delete",
+					"NemoEntitystore %s is being deleted", NemoEntitystore.Name)
+				return ctrl.Result{}, err
+			}
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(NemoEntitystore, NemoEntitystoreFinalizer)
 			if err := r.Update(ctx, NemoEntitystore); err != nil {

internal/controller/nemo_evaluator_controller.go

@@ -132,13 +132,13 @@ func (r *NemoEvaluatorReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 	} else {
 		// The instance is being deleted
-		// Perform platform specific cleanup of resources
-		if err := r.cleanupNemoEvaluator(ctx, NemoEvaluator); err != nil {
-			r.GetEventRecorder().Eventf(NemoEvaluator, corev1.EventTypeNormal, "Delete",
-				"NemoEvaluator %s is being deleted", NemoEvaluator.Name)
-			return ctrl.Result{}, err
-		}
 		if controllerutil.ContainsFinalizer(NemoEvaluator, NemoEvaluatorFinalizer) {
+			// Perform platform specific cleanup of resources
+			if err := r.cleanupNemoEvaluator(ctx, NemoEvaluator); err != nil {
+				r.GetEventRecorder().Eventf(NemoEvaluator, corev1.EventTypeNormal, "Delete",
+					"NemoEvaluator %s is being deleted", NemoEvaluator.Name)
+				return ctrl.Result{}, err
+			}
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(NemoEvaluator, NemoEvaluatorFinalizer)
 			if err := r.Update(ctx, NemoEvaluator); err != nil {

internal/controller/nemo_guardrail_controller.go

@@ -132,14 +132,13 @@ func (r *NemoGuardrailReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 	} else {
 		// The instance is being deleted
-		// Perform platform specific cleanup of resources
-		if err := r.cleanupNemoGuardrail(ctx, NemoGuardrail); err != nil {
-			r.GetEventRecorder().Eventf(NemoGuardrail, corev1.EventTypeNormal, "Delete",
-				"NemoGuardrail %s is being deleted", NemoGuardrail.Name)
-			return ctrl.Result{}, err
-		}
-
 		if controllerutil.ContainsFinalizer(NemoGuardrail, NemoGuardrailFinalizer) {
+			// Perform platform specific cleanup of resources
+			if err := r.cleanupNemoGuardrail(ctx, NemoGuardrail); err != nil {
+				r.GetEventRecorder().Eventf(NemoGuardrail, corev1.EventTypeNormal, "Delete",
+					"NemoGuardrail %s is being deleted", NemoGuardrail.Name)
+				return ctrl.Result{}, err
+			}
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(NemoGuardrail, NemoGuardrailFinalizer)
 			if err := r.Update(ctx, NemoGuardrail); err != nil {

internal/controller/nemocustomizer_controller.go

@@ -146,14 +146,13 @@ func (r *NemoCustomizerReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		}
 	} else {
 		// The instance is being deleted
-		// Perform platform specific cleanup of resources
-		if err := r.cleanupNemoCustomizer(ctx, NemoCustomizer); err != nil {
-			r.GetEventRecorder().Eventf(NemoCustomizer, corev1.EventTypeNormal, "Delete",
-				"NemoCustomizer %s in being deleted", NemoCustomizer.Name)
-			return ctrl.Result{}, err
-		}
-
 		if controllerutil.ContainsFinalizer(NemoCustomizer, NemoCustomizerFinalizer) {
+			// Perform platform specific cleanup of resources
+			if err := r.cleanupNemoCustomizer(ctx, NemoCustomizer); err != nil {
+				r.GetEventRecorder().Eventf(NemoCustomizer, corev1.EventTypeNormal, "Delete",
+					"NemoCustomizer %s in being deleted", NemoCustomizer.Name)
+				return ctrl.Result{}, err
+			}
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(NemoCustomizer, NemoCustomizerFinalizer)
 			if err := r.Update(ctx, NemoCustomizer); err != nil {

internal/controller/nimcache_controller.go

@@ -165,12 +165,12 @@ func (r *NIMCacheReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		}
 	} else {
 		// The instance is being deleted
-		// Perform cleanup of resources
-		if err = r.cleanupNIMCache(ctx, nimCache); err != nil {
-			return ctrl.Result{}, err
-		}
-
 		if controllerutil.ContainsFinalizer(nimCache, NIMCacheFinalizer) {
+			// Perform cleanup of resources
+			if err = r.cleanupNIMCache(ctx, nimCache); err != nil {
+				return ctrl.Result{}, err
+			}
+
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(nimCache, NIMCacheFinalizer)
 			if err := r.Update(ctx, nimCache); err != nil {

internal/controller/nimpipeline_controller.go

@@ -89,12 +89,11 @@ func (r *NIMPipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 	} else {
 		// The instance is being deleted
-		// Perform cleanup of resources
-		if err := r.cleanupNIMPipeline(ctx, nimPipeline); err != nil {
-			return ctrl.Result{}, err
-		}
-
 		if controllerutil.ContainsFinalizer(nimPipeline, NIMPipelineFinalizer) {
+			// Perform cleanup of resources
+			if err := r.cleanupNIMPipeline(ctx, nimPipeline); err != nil {
+				return ctrl.Result{}, err
+			}
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(nimPipeline, NIMPipelineFinalizer)
 			if err := r.Update(ctx, nimPipeline); err != nil {

internal/controller/nimservice_controller.go

@@ -133,14 +133,14 @@ func (r *NIMServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 	} else {
 		// The instance is being deleted
-		// Perform platform specific cleanup of resources
-		if err := r.Platform.Delete(ctx, r, nimService); err != nil {
-			r.GetEventRecorder().Eventf(nimService, corev1.EventTypeNormal, "Delete",
-				"NIMService %s is being deleted", nimService.Name)
-			return ctrl.Result{}, err
-		}
-
 		if controllerutil.ContainsFinalizer(nimService, NIMServiceFinalizer) {
+			// Perform platform specific cleanup of resources
+			if err := r.Platform.Delete(ctx, r, nimService); err != nil {
+				r.GetEventRecorder().Eventf(nimService, corev1.EventTypeNormal, "Delete",
+					"NIMService %s is being deleted", nimService.Name)
+				return ctrl.Result{}, err
+			}
+
 			// Remove finalizer to allow for deletion
 			controllerutil.RemoveFinalizer(nimService, NIMServiceFinalizer)
 			if err := r.Update(ctx, nimService); err != nil {