diff --git a/controllers/fenceagentsremediation_controller.go b/controllers/fenceagentsremediation_controller.go index 8c806581..53a5df02 100644 --- a/controllers/fenceagentsremediation_controller.go +++ b/controllers/fenceagentsremediation_controller.go @@ -247,6 +247,11 @@ func isTimedOutByNHC(far *v1alpha1.FenceAgentsRemediation) bool { // updateStatus updates the CR status, and returns an error if it fails func (r *FenceAgentsRemediationReconciler) updateStatus(ctx context.Context, far *v1alpha1.FenceAgentsRemediation) error { + // When CR doesn't include a finalizer and the CR deletionTimestamp exsists + // then we can skip update, since it will be removed soon. + if !controllerutil.ContainsFinalizer(far, v1alpha1.FARFinalizer) && !far.ObjectMeta.DeletionTimestamp.IsZero() { + return nil + } if err := r.Client.Status().Update(ctx, far); err != nil { if !apiErrors.IsConflict(err) { r.Log.Error(err, "failed to update far status in case on a non conflict")