From 3057ddd97fe73e0cfeddc317c193efa2488684fb Mon Sep 17 00:00:00 2001 From: Fabian Wiesel Date: Fri, 13 Mar 2026 11:54:23 +0100 Subject: [PATCH] Aggregates: Do not swallow error The error was actually in result.Err, not err. So handle and return that one. --- internal/controller/traits_controller.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/controller/traits_controller.go b/internal/controller/traits_controller.go index 260efa8..19b71ff 100644 --- a/internal/controller/traits_controller.go +++ b/internal/controller/traits_controller.go @@ -133,14 +133,15 @@ func (tc *TraitsController) Reconcile(ctx context.Context, req ctrl.Request) (ct ResourceProviderGeneration: current.ResourceProviderGeneration, Traits: targetTraits, }) - - if result.Err != nil { + err = result.Err + if err != nil { // set status condition base := hv.DeepCopy() if meta.SetStatusCondition(&hv.Status.Conditions, getTraitCondition(err, "Failed to update traits in placement")) { - err = errors.Join(tc.Status().Patch(ctx, hv, k8sclient.MergeFromWithOptions(base, - k8sclient.MergeFromWithOptimisticLock{}), k8sclient.FieldOwner(TraitsControllerName))) + err = errors.Join(err, + tc.Status().Patch(ctx, hv, k8sclient.MergeFromWithOptions(base, + k8sclient.MergeFromWithOptimisticLock{}), k8sclient.FieldOwner(TraitsControllerName))) } return ctrl.Result{}, err }