Use optimistic locking when patching the node taints

fiunchinho · fiunchinho · commit be88b6762a34 · 2025-10-09T11:25:01.000+02:00
diff --git a/internal/controllers/machine/machine_controller_noderef.go b/internal/controllers/machine/machine_controller_noderef.go
@@ -356,7 +356,7 @@ func (r *Reconciler) patchNode(ctx context.Context, remoteClient client.Client,
 		return nil
 	}
 
-	return remoteClient.Patch(ctx, newNode, client.StrategicMergeFrom(node))
+	return remoteClient.Patch(ctx, newNode, client.StrategicMergeFrom(node, client.MergeFromWithOptimisticLock{}))
 }
 
 // shouldNodeHaveOutdatedTaint tries to compare the revision of the owning MachineSet to the MachineDeployment.

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ func (r *Reconciler) patchNode(ctx context.Context, remoteClient client.Client,`
`356`	`356`	`return nil`
`357`	`357`	`}`
`358`	`358`
`359`		`- return remoteClient.Patch(ctx, newNode, client.StrategicMergeFrom(node))`
	`359`	`+ return remoteClient.Patch(ctx, newNode, client.StrategicMergeFrom(node, client.MergeFromWithOptimisticLock{}))`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`// shouldNodeHaveOutdatedTaint tries to compare the revision of the owning MachineSet to the MachineDeployment.`