Skip to content

Commit 69303b0

Browse files
Merge pull request #122 from shivamerla/fix_cr_deletions
Don't ignore update events on CRs when the object is marked for deletion
2 parents f811579 + 331f3cc commit 69303b0

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

internal/controller/nimcache_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,11 @@ func (r *NIMCacheReconciler) SetupWithManager(mgr ctrl.Manager) error {
209209
if oldNIMCache, ok := e.ObjectOld.(*appsv1alpha1.NIMCache); ok {
210210
newNIMCache := e.ObjectNew.(*appsv1alpha1.NIMCache)
211211

212+
// Handle case where object is marked for deletion
213+
if !newNIMCache.ObjectMeta.DeletionTimestamp.IsZero() {
214+
return true
215+
}
216+
212217
// Handle only spec updates
213218
return !reflect.DeepEqual(oldNIMCache.Spec, newNIMCache.Spec)
214219
}

internal/controller/nimpipeline_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,11 @@ func (r *NIMPipelineReconciler) SetupWithManager(mgr ctrl.Manager) error {
367367
if oldNIMPipeline, ok := e.ObjectOld.(*appsv1alpha1.NIMPipeline); ok {
368368
newNIMPipeline := e.ObjectNew.(*appsv1alpha1.NIMPipeline)
369369

370+
// Handle case where object is marked for deletion
371+
if !newNIMPipeline.ObjectMeta.DeletionTimestamp.IsZero() {
372+
return true
373+
}
374+
370375
// Handle only spec updates
371376
return !reflect.DeepEqual(oldNIMPipeline.Spec, newNIMPipeline.Spec)
372377
}

internal/controller/nimservice_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,11 @@ func (r *NIMServiceReconciler) SetupWithManager(mgr ctrl.Manager) error {
194194
if oldNIMService, ok := e.ObjectOld.(*appsv1alpha1.NIMService); ok {
195195
newNIMService := e.ObjectNew.(*appsv1alpha1.NIMService)
196196

197+
// Handle case where object is marked for deletion
198+
if !newNIMService.ObjectMeta.DeletionTimestamp.IsZero() {
199+
return true
200+
}
201+
197202
// Handle only spec updates
198203
return !reflect.DeepEqual(oldNIMService.Spec, newNIMService.Spec)
199204
}

0 commit comments

Comments
 (0)