resource: use Patch in APIFinalizer

Signed-off-by: Dr. Stefan Schimanski <[email protected]>
crossplane · Sep 18, 2023 · 6fe554e · 6fe554e
1 parent 2ad600c
commit 6fe554e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/resource/api.go b/pkg/resource/api.go
@@ -161,17 +161,19 @@ func (a *APIFinalizer) AddFinalizer(ctx context.Context, obj Object) error {
 	if meta.FinalizerExists(obj, a.finalizer) {
 		return nil
 	}
+	orig := obj.DeepCopyObject().(Object)
 	meta.AddFinalizer(obj, a.finalizer)
-	return errors.Wrap(a.client.Update(ctx, obj), errUpdateObject)
+	return errors.Wrap(a.client.Patch(ctx, obj, client.MergeFromWithOptions(orig, client.MergeFromWithOptimisticLock{})), errUpdateObject)
 }
 
 // RemoveFinalizer from the supplied Managed resource.
 func (a *APIFinalizer) RemoveFinalizer(ctx context.Context, obj Object) error {
 	if !meta.FinalizerExists(obj, a.finalizer) {
 		return nil
 	}
+	orig := obj.DeepCopyObject().(Object)
 	meta.RemoveFinalizer(obj, a.finalizer)
-	return errors.Wrap(IgnoreNotFound(a.client.Update(ctx, obj)), errUpdateObject)
+	return errors.Wrap(IgnoreNotFound(a.client.Patch(ctx, obj, client.MergeFromWithOptions(orig, client.MergeFromWithOptimisticLock{}))), errUpdateObject)
 }
 
 // A FinalizerFns satisfy the Finalizer interface.