From c18cfe1c24cac81f623486f78dc7001916fb205a Mon Sep 17 00:00:00 2001 From: Ramon Quitales Date: Sat, 21 Sep 2024 10:52:33 -0700 Subject: [PATCH] fix: always use FieldManager for Create/Patch/Update calls --- operator/internal/controller/auto/update_controller.go | 2 +- operator/internal/controller/pulumi/stack_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/operator/internal/controller/auto/update_controller.go b/operator/internal/controller/auto/update_controller.go index 3655eae7..c420b5ff 100644 --- a/operator/internal/controller/auto/update_controller.go +++ b/operator/internal/controller/auto/update_controller.go @@ -106,7 +106,7 @@ func (r *UpdateReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr meta.SetStatusCondition(&obj.Status.Conditions, *rs.failed) rs.complete.ObservedGeneration = obj.Generation meta.SetStatusCondition(&obj.Status.Conditions, *rs.complete) - return r.Status().Update(ctx, obj) + return r.Status().Update(ctx, obj, client.FieldOwner(FieldManager)) } if rs.complete.Status == metav1.ConditionTrue { diff --git a/operator/internal/controller/pulumi/stack_controller.go b/operator/internal/controller/pulumi/stack_controller.go index 63bea4d6..4d274fde 100644 --- a/operator/internal/controller/pulumi/stack_controller.go +++ b/operator/internal/controller/pulumi/stack_controller.go @@ -441,7 +441,7 @@ func (r *StackReconciler) Reconcile(ctx context.Context, request ctrl.Request) ( } saveStatus := func() error { - if err := r.Status().Update(ctx, instance); err != nil { + if err := r.Status().Update(ctx, instance, client.FieldOwner(FieldManager)); err != nil { log.Error(err, "unable to save object status") return err }