Aggregates: Use Patch + FieldOwner

FieldOwner allows us to identify who maintains a field and detect
if there is a conflict between multiple controllers.

Author: fwiesel

internal/controller/aggregates_controller.go

@@ -114,14 +114,15 @@ func (ac *AggregatesController) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 
+	base := hv.DeepCopy()
 	hv.Status.Aggregates = hv.Spec.Aggregates
 	meta.SetStatusCondition(&hv.Status.Conditions, metav1.Condition{
 		Type:    kvmv1.ConditionTypeAggregatesUpdated,
 		Status:  metav1.ConditionTrue,
 		Reason:  kvmv1.ConditionReasonSucceeded,
 		Message: "Aggregates updated successfully",
 	})
-	return ctrl.Result{}, ac.Status().Update(ctx, hv)
+	return ctrl.Result{}, ac.Status().Patch(ctx, hv, k8sclient.MergeFromWithOptions(base, k8sclient.MergeFromWithOptimisticLock{}), k8sclient.FieldOwner(AggregatesControllerName))
 }
 
 // setErrorCondition sets the error condition on the Hypervisor status, returns error if update fails
@@ -133,8 +134,9 @@ func (ac *AggregatesController) setErrorCondition(ctx context.Context, hv *kvmv1
 		Message: msg,
 	}
 
+	base := hv.DeepCopy()
 	if meta.SetStatusCondition(&hv.Status.Conditions, condition) {
-		if err := ac.Status().Update(ctx, hv); err != nil {
+		if err := ac.Status().Patch(ctx, hv, k8sclient.MergeFromWithOptions(base, k8sclient.MergeFromWithOptimisticLock{}), k8sclient.FieldOwner(AggregatesControllerName)); err != nil {
 			return err
 		}
 	}