Merge pull request #430 from kstrenkova/fix-logger-and-move-failure-case

Fix logger and move failure case

Author: openshift-merge-bot[bot]

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) {

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