add retry logic for ngf and nginx pods

Author: salonichf5

tests/framework/resourcemanager.go

@@ -692,25 +692,32 @@ func GetReadyNGFPodNames(
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	var podList core.PodList
-	if err := k8sClient.List(
-		ctx,
-		&podList,
-		client.InNamespace(namespace),
-		client.MatchingLabels{
-			"app.kubernetes.io/instance": releaseName,
-		},
-	); err != nil {
-		return nil, fmt.Errorf("error getting list of NGF Pods: %w", err)
-	}
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
 
-	if len(podList.Items) == 0 {
-		return nil, errors.New("unable to find NGF Pod(s)")
-	}
-
-	names := getReadyPodNames(podList)
+	for {
+		select {
+		case <-ctx.Done():
+			return nil, fmt.Errorf("timed out waiting for the NGF Pod to be ready: %w", ctx.Err())
+		case <-ticker.C:
+			var podList core.PodList
+			if err := k8sClient.List(
+				ctx,
+				&podList,
+				client.InNamespace(namespace),
+				client.MatchingLabels{
+					"app.kubernetes.io/instance": releaseName,
+				},
+			); err != nil {
+				return nil, fmt.Errorf("error getting the NGF Pod: %w", err)
+			}
 
-	return names, nil
+			names := getReadyPodNames(podList)
+			if len(names) > 0 {
+				return names, nil
+			}
+		}
+	}
 }
 
 // GetReadyNginxPodNames returns the name(s) of the NGINX Pod(s).
@@ -722,23 +729,30 @@ func GetReadyNginxPodNames(
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	var podList core.PodList
-	if err := k8sClient.List(
-		ctx,
-		&podList,
-		client.InNamespace(namespace),
-		client.HasLabels{"gateway.networking.k8s.io/gateway-name"},
-	); err != nil {
-		return nil, fmt.Errorf("error getting list of NGINX Pods: %w", err)
-	}
-
-	if len(podList.Items) == 0 {
-		return nil, errors.New("unable to find NGINX Pod(s)")
-	}
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
 
-	names := getReadyPodNames(podList)
+	for {
+		select {
+		case <-ctx.Done():
+			return nil, fmt.Errorf("timed out waiting for NGINX Pods to be ready: %w", ctx.Err())
+		case <-ticker.C:
+			var podList core.PodList
+			if err := k8sClient.List(
+				ctx,
+				&podList,
+				client.InNamespace(namespace),
+				client.HasLabels{"gateway.networking.k8s.io/gateway-name"},
+			); err != nil {
+				return nil, fmt.Errorf("error getting list of NGINX Pods: %w", err)
+			}
 
-	return names, nil
+			names := getReadyPodNames(podList)
+			if len(names) > 0 {
+				return names, nil
+			}
+		}
+	}
 }
 
 func getReadyPodNames(podList core.PodList) []string {