Skip to content

Commit 463c0cd

Browse files
shivamerlashivamerla
committed
Add custom cleanup only when the NIM operator finalizer is present
Signed-off-by: Shiva Krishna, Merla <smerla@nvidia.com>
1 parent b644fa7 commit 463c0cd

9 files changed

Lines changed: 50 additions & 53 deletions

‎internal/controller/nemo_datastore_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ func (r *NemoDatastoreReconciler) Reconcile(ctx context.Context, req ctrl.Reques
133133
}
134134
} else {
135135
// The instance is being deleted
136-
// Perform platform specific cleanup of resources
137-
if err := r.cleanupNemoDatastore(ctx, NemoDatastore); err != nil {
138-
r.GetEventRecorder().Eventf(NemoDatastore, corev1.EventTypeNormal, "Delete",
139-
"NemoDatastore %s is being deleted", NemoDatastore.Name)
140-
return ctrl.Result{}, err
141-
}
142136
if controllerutil.ContainsFinalizer(NemoDatastore, NemoDatastoreFinalizer) {
137+
// Perform platform specific cleanup of resources
138+
if err := r.cleanupNemoDatastore(ctx, NemoDatastore); err != nil {
139+
r.GetEventRecorder().Eventf(NemoDatastore, corev1.EventTypeNormal, "Delete",
140+
"NemoDatastore %s is being deleted", NemoDatastore.Name)
141+
return ctrl.Result{}, err
142+
}
143143
// Remove finalizer to allow for deletion
144144
controllerutil.RemoveFinalizer(NemoDatastore, NemoDatastoreFinalizer)
145145
if err := r.Update(ctx, NemoDatastore); err != nil {

‎internal/controller/nemo_entitystore_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ func (r *NemoEntitystoreReconciler) Reconcile(ctx context.Context, req ctrl.Requ
132132
}
133133
} else {
134134
// The instance is being deleted
135-
// Perform platform specific cleanup of resources
136-
if err := r.cleanupNemoEntitystore(ctx, NemoEntitystore); err != nil {
137-
r.GetEventRecorder().Eventf(NemoEntitystore, corev1.EventTypeNormal, "Delete",
138-
"NemoEntitystore %s is being deleted", NemoEntitystore.Name)
139-
return ctrl.Result{}, err
140-
}
141135
if controllerutil.ContainsFinalizer(NemoEntitystore, NemoEntitystoreFinalizer) {
136+
// Perform platform specific cleanup of resources
137+
if err := r.cleanupNemoEntitystore(ctx, NemoEntitystore); err != nil {
138+
r.GetEventRecorder().Eventf(NemoEntitystore, corev1.EventTypeNormal, "Delete",
139+
"NemoEntitystore %s is being deleted", NemoEntitystore.Name)
140+
return ctrl.Result{}, err
141+
}
142142
// Remove finalizer to allow for deletion
143143
controllerutil.RemoveFinalizer(NemoEntitystore, NemoEntitystoreFinalizer)
144144
if err := r.Update(ctx, NemoEntitystore); err != nil {

‎internal/controller/nemo_evaluator_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ func (r *NemoEvaluatorReconciler) Reconcile(ctx context.Context, req ctrl.Reques
133133
}
134134
} else {
135135
// The instance is being deleted
136-
// Perform platform specific cleanup of resources
137-
if err := r.cleanupNemoEvaluator(ctx, NemoEvaluator); err != nil {
138-
r.GetEventRecorder().Eventf(NemoEvaluator, corev1.EventTypeNormal, "Delete",
139-
"NemoEvaluator %s is being deleted", NemoEvaluator.Name)
140-
return ctrl.Result{}, err
141-
}
142136
if controllerutil.ContainsFinalizer(NemoEvaluator, NemoEvaluatorFinalizer) {
137+
// Perform platform specific cleanup of resources
138+
if err := r.cleanupNemoEvaluator(ctx, NemoEvaluator); err != nil {
139+
r.GetEventRecorder().Eventf(NemoEvaluator, corev1.EventTypeNormal, "Delete",
140+
"NemoEvaluator %s is being deleted", NemoEvaluator.Name)
141+
return ctrl.Result{}, err
142+
}
143143
// Remove finalizer to allow for deletion
144144
controllerutil.RemoveFinalizer(NemoEvaluator, NemoEvaluatorFinalizer)
145145
if err := r.Update(ctx, NemoEvaluator); err != nil {

‎internal/controller/nemo_guardrail_controller.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,13 @@ func (r *NemoGuardrailReconciler) Reconcile(ctx context.Context, req ctrl.Reques
133133
}
134134
} else {
135135
// The instance is being deleted
136-
// Perform platform specific cleanup of resources
137-
if err := r.cleanupNemoGuardrail(ctx, NemoGuardrail); err != nil {
138-
r.GetEventRecorder().Eventf(NemoGuardrail, corev1.EventTypeNormal, "Delete",
139-
"NemoGuardrail %s is being deleted", NemoGuardrail.Name)
140-
return ctrl.Result{}, err
141-
}
142-
143136
if controllerutil.ContainsFinalizer(NemoGuardrail, NemoGuardrailFinalizer) {
137+
// Perform platform specific cleanup of resources
138+
if err := r.cleanupNemoGuardrail(ctx, NemoGuardrail); err != nil {
139+
r.GetEventRecorder().Eventf(NemoGuardrail, corev1.EventTypeNormal, "Delete",
140+
"NemoGuardrail %s is being deleted", NemoGuardrail.Name)
141+
return ctrl.Result{}, err
142+
}
144143
// Remove finalizer to allow for deletion
145144
controllerutil.RemoveFinalizer(NemoGuardrail, NemoGuardrailFinalizer)
146145
if err := r.Update(ctx, NemoGuardrail); err != nil {

‎internal/controller/nemocustomizer_controller.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,13 @@ func (r *NemoCustomizerReconciler) Reconcile(ctx context.Context, req ctrl.Reque
147147
}
148148
} else {
149149
// The instance is being deleted
150-
// Perform platform specific cleanup of resources
151-
if err := r.cleanupNemoCustomizer(ctx, NemoCustomizer); err != nil {
152-
r.GetEventRecorder().Eventf(NemoCustomizer, corev1.EventTypeNormal, "Delete",
153-
"NemoCustomizer %s in being deleted", NemoCustomizer.Name)
154-
return ctrl.Result{}, err
155-
}
156-
157150
if controllerutil.ContainsFinalizer(NemoCustomizer, NemoCustomizerFinalizer) {
151+
// Perform platform specific cleanup of resources
152+
if err := r.cleanupNemoCustomizer(ctx, NemoCustomizer); err != nil {
153+
r.GetEventRecorder().Eventf(NemoCustomizer, corev1.EventTypeNormal, "Delete",
154+
"NemoCustomizer %s in being deleted", NemoCustomizer.Name)
155+
return ctrl.Result{}, err
156+
}
158157
// Remove finalizer to allow for deletion
159158
controllerutil.RemoveFinalizer(NemoCustomizer, NemoCustomizerFinalizer)
160159
if err := r.Update(ctx, NemoCustomizer); err != nil {

‎internal/controller/nimbuild_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ func (r *NIMBuildReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
137137
}
138138
} else {
139139
// The instance is being deleted
140-
// Perform cleanup of resources
141-
if err = r.cleanupNIMBuild(ctx, nimBuild); err != nil {
142-
return ctrl.Result{}, err
143-
}
144140
if controllerutil.ContainsFinalizer(nimBuild, NIMBuildFinalizer) {
141+
// Perform cleanup of resources
142+
if err = r.cleanupNIMBuild(ctx, nimBuild); err != nil {
143+
return ctrl.Result{}, err
144+
}
145145
// Remove finalizer to allow for deletion
146146
controllerutil.RemoveFinalizer(nimBuild, NIMBuildFinalizer)
147147
if err := r.Update(ctx, nimBuild); err != nil {

‎internal/controller/nimcache_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ func (r *NIMCacheReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
162162
}
163163
} else {
164164
// The instance is being deleted
165-
// Perform cleanup of resources
166-
if err = r.cleanupNIMCache(ctx, nimCache); err != nil {
167-
return ctrl.Result{}, err
168-
}
169-
170165
if controllerutil.ContainsFinalizer(nimCache, NIMCacheFinalizer) {
166+
// Perform cleanup of resources
167+
if err = r.cleanupNIMCache(ctx, nimCache); err != nil {
168+
return ctrl.Result{}, err
169+
}
170+
171171
// Remove finalizer to allow for deletion
172172
controllerutil.RemoveFinalizer(nimCache, NIMCacheFinalizer)
173173
if err := r.Update(ctx, nimCache); err != nil {

‎internal/controller/nimpipeline_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,11 @@ func (r *NIMPipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
8989
}
9090
} else {
9191
// The instance is being deleted
92-
// Perform cleanup of resources
93-
if err := r.cleanupNIMPipeline(ctx, nimPipeline); err != nil {
94-
return ctrl.Result{}, err
95-
}
96-
9792
if controllerutil.ContainsFinalizer(nimPipeline, NIMPipelineFinalizer) {
93+
// Perform cleanup of resources
94+
if err := r.cleanupNIMPipeline(ctx, nimPipeline); err != nil {
95+
return ctrl.Result{}, err
96+
}
9897
// Remove finalizer to allow for deletion
9998
controllerutil.RemoveFinalizer(nimPipeline, NIMPipelineFinalizer)
10099
if err := r.Update(ctx, nimPipeline); err != nil {

‎internal/controller/nimservice_controller.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ func (r *NIMServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request)
144144
}
145145
} else {
146146
// The instance is being deleted
147-
// Perform platform specific cleanup of resources
148-
if err := r.Platform.Delete(ctx, r, nimService); err != nil {
149-
r.GetEventRecorder().Eventf(nimService, corev1.EventTypeNormal, "Delete",
150-
"NIMService %s is being deleted", nimService.Name)
151-
return ctrl.Result{}, err
152-
}
153-
154147
if controllerutil.ContainsFinalizer(nimService, NIMServiceFinalizer) {
148+
// Perform platform specific cleanup of resources
149+
if err := r.Platform.Delete(ctx, r, nimService); err != nil {
150+
r.GetEventRecorder().Eventf(nimService, corev1.EventTypeNormal, "Delete",
151+
"NIMService %s is being deleted", nimService.Name)
152+
return ctrl.Result{}, err
153+
}
154+
155155
// Remove finalizer to allow for deletion
156156
controllerutil.RemoveFinalizer(nimService, NIMServiceFinalizer)
157157
if err := r.Update(ctx, nimService); err != nil {

0 commit comments

Comments
 (0)