@@ -179,18 +179,19 @@ func (r *NodeDecommissionReconciler) removeFinalizer(ctx context.Context, node *
179179
180180 nodeBase := node .DeepCopy ()
181181 controllerutil .RemoveFinalizer (node , decommissionFinalizerName )
182- err := r .Patch (ctx , node , k8sclient .MergeFromWithOptions (nodeBase , k8sclient.MergeFromWithOptimisticLock {}))
182+ err := r .Patch (ctx , node , k8sclient .MergeFromWithOptions (nodeBase , k8sclient.MergeFromWithOptimisticLock {}), k8sclient . FieldOwner ( DecommissionControllerName ) )
183183 return ctrl.Result {}, err
184184}
185185
186186func (r * NodeDecommissionReconciler ) setDecommissioningCondition (ctx context.Context , hv * kvmv1.Hypervisor , message string ) (ctrl.Result , error ) {
187+ base := hv .DeepCopy ()
187188 meta .SetStatusCondition (& hv .Status .Conditions , metav1.Condition {
188189 Type : kvmv1 .ConditionTypeReady ,
189190 Status : metav1 .ConditionFalse ,
190191 Reason : "Decommissioning" ,
191192 Message : message ,
192193 })
193- if err := r .Status ().Update (ctx , hv ); err != nil {
194+ if err := r .Status ().Patch (ctx , hv , k8sclient . MergeFromWithOptions ( base , k8sclient. MergeFromWithOptimisticLock {}), k8sclient . FieldOwner ( DecommissionControllerName ) ); err != nil {
194195 return ctrl.Result {}, fmt .Errorf ("cannot update hypervisor status due to %w" , err )
195196 }
196197 return ctrl.Result {}, nil
0 commit comments