From 4c72af7fe8f89aafe2a2d167aa9c326e7bb8389a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=A4hler?= <26610571+oliverbaehler@users.noreply.github.com> Date: Fri, 5 Jun 2026 11:08:31 +0200 Subject: [PATCH] fix: best effort patch reconciling status (#1952) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(controller): decode old object for delete requests Signed-off-by: Oliver Bähler * chore: modernize golang Signed-off-by: Oliver Bähler * chore: modernize golang Signed-off-by: Oliver Bähler * chore: modernize golang Signed-off-by: Oliver Bähler * fix: preserve ca-bundles injected from external providers Signed-off-by: Oliver Baehler * fix: best effort patch reconciling status Signed-off-by: Oliver Baehler --------- Signed-off-by: Oliver Bähler Signed-off-by: Oliver Baehler --- internal/controllers/resources/global.go | 5 ++--- internal/controllers/resources/namespaced.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/controllers/resources/global.go b/internal/controllers/resources/global.go index dd7958bb..01ebc830 100644 --- a/internal/controllers/resources/global.go +++ b/internal/controllers/resources/global.go @@ -206,14 +206,13 @@ func (r *globalResourceController) Reconcile(ctx context.Context, request reconc return requeue, nil } + // Best-Effort for Updating the status if updateErr := r.updateReconcilingStatus(ctx, tntResource); updateErr != nil { if caperrors.IgnoreGone(updateErr) { return reconcile.Result{}, nil } - statusErr = gherrors.Wrap(updateErr, "failed to update status") - - return requeue, nil + log.Error(updateErr, "failed to update status") } if c == nil { diff --git a/internal/controllers/resources/namespaced.go b/internal/controllers/resources/namespaced.go index 8d3e3e9d..039412c1 100644 --- a/internal/controllers/resources/namespaced.go +++ b/internal/controllers/resources/namespaced.go @@ -246,14 +246,13 @@ func (r *namespacedResourceController) Reconcile(ctx context.Context, request re return requeue, nil } + // Best-Effort for Updating the status if updateErr := r.updateReconcilingStatus(ctx, tntResource); updateErr != nil { if caperrors.IgnoreGone(updateErr) { return reconcile.Result{}, nil } - statusErr = gherrors.Wrap(updateErr, "failed to update status") - - return requeue, nil + log.Error(updateErr, "failed to update status") } if c == nil {