Merge pull request #160 from kajinamit/remove-finalizer-update

Skip redundant update when removing a finalizer
openstack-k8s-operators · Aug 2, 2023 · 67049bf · 67049bf
2 parents 5cac9bf + e0c2be9
commit 67049bf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/controllers/ceilometercentral_controller.go b/controllers/ceilometercentral_controller.go
@@ -182,11 +182,13 @@ func (r *CeilometerCentralReconciler) reconcileDelete(ctx context.Context, insta
 	}
 
 	if err == nil {
-		controllerutil.RemoveFinalizer(keystoneService, helper.GetFinalizer())
-		if err = helper.GetClient().Update(ctx, keystoneService); err != nil && !k8s_errors.IsNotFound(err) {
-			return ctrl.Result{}, err
+		if controllerutil.RemoveFinalizer(keystoneService, helper.GetFinalizer()) {
+			err = r.Update(ctx, keystoneService)
+			if err != nil && !k8s_errors.IsNotFound(err) {
+				return ctrl.Result{}, err
+			}
+			util.LogForObject(helper, "Removed finalizer from our KeystoneService", instance)
 		}
-		util.LogForObject(helper, "Removed finalizer from our KeystoneService", instance)
 	}
 
 	// Service is deleted so remove the finalizer.