Fix conflict RemoteMachine merges (k0smotron#922)

Signed-off-by: makhov <[email protected]>
makhov · Feb 18, 2025 · 75e2ad4 · 75e2ad4
1 parent 219dfba
commit 75e2ad4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/internal/controller/infrastructure/remote_machine_controller.go b/internal/controller/infrastructure/remote_machine_controller.go
@@ -263,7 +263,7 @@ func (r *RemoteMachineController) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 
 	err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-		return r.Status().Patch(ctx, m, client.Merge)
+		return r.Status().Patch(ctx, m, client.MergeFrom(machine))
 	})
 	if err != nil {
 		log.Error(err, "Failed to update Machine")