Merge branch 'main' into posikoya/refator-reconcile-err

Author: posikoya

OWNERS_ALIASES

@@ -7,10 +7,12 @@ aliases:
   - stuggi
   test-approvers:
   - lpiwowar
+  - adrianfusco
   - arxcruz
   - kstrenkova
   test-reviewers:
   - evallesp
-  - frenzyfriday
-  - sdatko
-  - adrianfusco
+  - rebtoor
+  - Valkyrie00
+  - imatza-rh
+  - posikoya

internal/controller/common.go

@@ -598,17 +598,21 @@ func (r *Reconciler) ReleaseLock(ctx context.Context, instance client.Object) (b
 	return false, ErrFailedToDeleteLock
 }
 
-// PodExists checks if a pod exists for the given instance and workflow step
-func (r *Reconciler) PodExists(ctx context.Context, instance client.Object, workflowStepIndex int) bool {
-	pod := &corev1.Pod{}
+// GetPodIfExists returns the pod for the given instance and workflow step if it exists
+func (r *Reconciler) GetPodIfExists(
+	ctx context.Context,
+	instance client.Object,
+	workflowStepIndex int,
+) (*corev1.Pod, error) {
 	podName := r.GetPodName(instance, workflowStepIndex)
-	objectKey := client.ObjectKey{Namespace: instance.GetNamespace(), Name: podName}
-	err := r.Client.Get(ctx, objectKey, pod)
-	if err != nil && k8s_errors.IsNotFound(err) {
-		return false
+	pod, err := r.GetPod(ctx, podName, instance.GetNamespace())
+	if err != nil {
+		if k8s_errors.IsNotFound(err) {
+			return nil, nil
+		}
+		return nil, err
 	}
-
-	return true
+	return pod, nil
 }
 
 // GetCommonRbacRules returns the common RBAC rules for test operations, with optional privileged permissions
@@ -690,10 +694,8 @@ func (r *Reconciler) VerifyNetworkAttachments(
 	conditions *condition.Conditions,
 	networkAttachmentStatus *map[string][]string,
 ) (ctrl.Result, error) {
-	Log := r.GetLogger(ctx)
-
 	pod, err := r.GetPodIfExists(ctx, instance, workflowStepIndex)
-	if err != nil {
+	if pod == nil {
 		return ctrl.Result{}, err
 	}