change to check lb available, remove debug lines

Author: oliviassss

scripts/ci_e2e_test.sh

@@ -209,8 +209,7 @@ test_controller_image() {
   CERT_ID2="724963dd-f571-4f2c-b549-5c7d0e35e4b8"
   CERT_ID3="1001570b-1779-40c3-9b49-9a9a41e30058"
   CERTIFICATE_ARNS=${CERTIFICATE_ARNS:-"${CERTIFICATE_ARN_PREFIX}/${CERT_ID1},${CERTIFICATE_ARN_PREFIX}/${CERT_ID2},${CERTIFICATE_ARN_PREFIX}/${CERT_ID3}"}
-  echo "!!!! running the ci_e2e_test.sh with changes"
-  ginkgo -v -r test/e2e --timeout 2h -- \
+  ginkgo -timeout 2h -v -r test/e2e -- \
     --kubeconfig=${CLUSTER_KUBECONFIG} \
     --cluster-name=${CLUSTER_NAME} \
     --aws-region=${AWS_REGION} \

test/e2e/service/nlb_instance_target_test.go

@@ -3,13 +3,14 @@ package service
 import (
 	"context"
 	"fmt"
+	"strings"
+
 	awssdk "github.com/aws/aws-sdk-go/aws"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/aws-load-balancer-controller/test/framework/http"
 	"sigs.k8s.io/aws-load-balancer-controller/test/framework/utils"
-	"strings"
 )
 
 var _ = Describe("test k8s service reconciled by the aws load balancer controller", func() {
@@ -206,10 +207,8 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 					})
 				}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
 			})
-			By("waiting for target group targets to be healthy", func() {
-				nodeList, err := stack.GetWorkerNodes(ctx, tf)
-				Expect(err).ToNot(HaveOccurred())
-				err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
+			By("waiting for load balancer to be available", func() {
+				err := tf.LBManager.WaitUntilLoadBalancerAvailable(ctx, lbARN)
 				Expect(err).NotTo(HaveOccurred())
 			})
 		})
@@ -274,10 +273,8 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 					return verifyLoadBalancerListenerCertificates(ctx, tf, lbARN, certs) == nil
 				}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
 			})
-			By("waiting for target group targets to be healthy", func() {
-				nodeList, err := stack.GetWorkerNodes(ctx, tf)
-				Expect(err).ToNot(HaveOccurred())
-				err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
+			By("waiting for load balancer to be available", func() {
+				err := tf.LBManager.WaitUntilLoadBalancerAvailable(ctx, lbARN)
 				Expect(err).NotTo(HaveOccurred())
 			})
 		})
@@ -310,12 +307,10 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 						"deregistration_delay.timeout_seconds": "120",
 					})
 				}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
-				By("waiting for target group targets to be healthy", func() {
-					nodeList, err := stack.GetWorkerNodes(ctx, tf)
-					Expect(err).ToNot(HaveOccurred())
-					err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
-					Expect(err).NotTo(HaveOccurred())
-				})
+			})
+			By("waiting for load balancer to be available", func() {
+				err := tf.LBManager.WaitUntilLoadBalancerAvailable(ctx, lbARN)
+				Expect(err).NotTo(HaveOccurred())
 			})
 		})
 	})
@@ -363,10 +358,8 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 				err = verifyTargetGroupNumRegistered(ctx, tf, tgARN, len(nodes))
 				Expect(err).ToNot(HaveOccurred())
 			})
-			By("waiting for target group targets to be healthy", func() {
-				nodeList, err := stack.GetWorkerNodes(ctx, tf)
-				Expect(err).ToNot(HaveOccurred())
-				err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
+			By("waiting for load balancer to be available", func() {
+				err := tf.LBManager.WaitUntilLoadBalancerAvailable(ctx, lbARN)
 				Expect(err).NotTo(HaveOccurred())
 			})
 		})

test/e2e/service/nlb_ip_target_test.go

@@ -405,8 +405,8 @@ var _ = Describe("k8s service reconciled by the aws load balancer", func() {
 				})
 				Expect(err).ToNot(HaveOccurred())
 			})
-			By("waiting for target group targets to be healthy", func() {
-				err := waitUntilTargetsAreHealthy(ctx, tf, lbARN, int(numReplicas))
+			By("waiting for load balancer to be available", func() {
+				err := tf.LBManager.WaitUntilLoadBalancerAvailable(ctx, lbARN)
 				Expect(err).NotTo(HaveOccurred())
 			})
 		})