From f415cd9b112278867462d68541b8ce3341c6b4a5 Mon Sep 17 00:00:00 2001 From: Katarina Strenkova Date: Tue, 31 Mar 2026 10:19:34 -0400 Subject: [PATCH 1/2] Fix common logger The common logger was not taking context into consideration and therefore it was not printing out logs the same way as other loggers. With this PR the common logger should now print logs correctly. --- internal/controller/common.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/controller/common.go b/internal/controller/common.go index 57aa5688..b6c174bd 100644 --- a/internal/controller/common.go +++ b/internal/controller/common.go @@ -31,6 +31,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + "sigs.k8s.io/controller-runtime/pkg/log" ) const ( @@ -489,8 +490,8 @@ func (r *Reconciler) EnsureLogsPVCExists( } // GetLogger returns the logger instance -func (r *Reconciler) GetLogger() logr.Logger { - return r.Log +func (r *Reconciler) GetLogger(ctx context.Context) logr.Logger { + return log.FromContext(ctx) } // GetScheme returns the runtime scheme @@ -555,7 +556,7 @@ func (r *Reconciler) AcquireLock( // ReleaseLock releases the lock for the given instance func (r *Reconciler) ReleaseLock(ctx context.Context, instance client.Object) (bool, error) { - Log := r.GetLogger() + Log := r.GetLogger(ctx) cm, err := r.GetLockInfo(ctx, instance) if err != nil && k8s_errors.IsNotFound(err) { From f771884babb560f3a591bf9f3cd9dc2fae373a6b Mon Sep 17 00:00:00 2001 From: Katarina Strenkova Date: Tue, 31 Mar 2026 10:24:49 -0400 Subject: [PATCH 2/2] Move checking for Failure action Move error handling directly after NextAction call instead of deferring it until later in the reconcile flow. This prevents executing unnecessary operations when NextAction has already failed. --- internal/controller/common_controller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/controller/common_controller.go b/internal/controller/common_controller.go index 987270b8..ea7ebdb8 100644 --- a/internal/controller/common_controller.go +++ b/internal/controller/common_controller.go @@ -180,6 +180,9 @@ func CommonReconcile[T TestResource]( } nextAction, workflowStepIndex, err := r.NextAction(ctx, instance, workflowLength) + if nextAction == Failure { + return ctrl.Result{}, err + } // Apply workflow step overrides to the base spec if config.SupportsWorkflow && workflowStepIndex < workflowLength { @@ -200,9 +203,6 @@ func CommonReconcile[T TestResource]( } switch nextAction { - case Failure: - return ctrl.Result{}, err - case Wait: Log.Info(InfoWaitingOnPod) return ctrl.Result{RequeueAfter: RequeueAfterValue}, nil