switch from r.Client.Update to r.Client.Patch when removing finalizers

Author: llxp

pkg/ipamutil/reconciler.go

@@ -140,11 +140,12 @@ func (r *ClaimReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ct
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			if !claim.ObjectMeta.DeletionTimestamp.IsZero() {
+				patch := client.MergeFrom(claim.DeepCopy())
 				if err := r.reconcileDelete(ctx, claim); err != nil {
 					return ctrl.Result{}, fmt.Errorf("reconcile delete: %w", err)
 				}
-				// we'll need to explicitly update the claim here since we haven't set up a patch helper yet.
-				if err := r.Client.Update(ctx, claim); err != nil {
+				// we'll need to explicitly patch the claim here since we haven't set up a patch helper yet.
+				if err := r.Client.Patch(ctx, claim, patch); err != nil {
 					return ctrl.Result{}, fmt.Errorf("patch after reconciling delete: %w", err)
 				}
 				return ctrl.Result{}, nil
@@ -272,8 +273,9 @@ func (r *ClaimReconciler) reconcileDelete(ctx context.Context, claim *ipamv1.IPA
 
 	if address.Name != "" {
 		var err error
+		patch := client.MergeFrom(address.DeepCopy())
 		if controllerutil.RemoveFinalizer(address, ProtectAddressFinalizer) {
-			if err = r.Client.Update(ctx, address); err != nil && !apierrors.IsNotFound(err) {
+			if err = r.Client.Patch(ctx, address, patch); err != nil && !apierrors.IsNotFound(err) {
 				return errors.Wrap(err, "failed to remove address finalizer")
 			}
 		}