Merge pull request kubernetes-sigs#2012 from olemarkus/e2e-filter-non…

…-eligible-targets Don't consider nodes with exclude-from-external-load-balancer eligible worker nodes in e2e
sonal-chauhan · May 17, 2021 · 8409bd5 · 8409bd5
2 parents 2577491 + c7dc98b
commit 8409bd5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/test/e2e/service/nlb_instance_target.go b/test/e2e/service/nlb_instance_target.go
@@ -55,12 +55,18 @@ func (s *NLBInstanceTestStack) GetLoadBalancerIngressHostName() string {
 }
 
 func (s *NLBInstanceTestStack) GetWorkerNodes(ctx context.Context, f *framework.Framework) ([]corev1.Node, error) {
-	nodeList := &corev1.NodeList{}
-	err := f.K8sClient.List(ctx, nodeList)
+	allNodes := &corev1.NodeList{}
+	err := f.K8sClient.List(ctx, allNodes)
 	if err != nil {
 		return nil, err
 	}
-	return nodeList.Items, nil
+	nodeList := []corev1.Node{}
+	for _, node := range allNodes.Items {
+		if _, notarget := node.Labels["node.kubernetes.io/exclude-from-external-load-balancers"]; !notarget {
+			nodeList = append(nodeList, node)
+		}
+	}
+	return nodeList, nil
 }
 
 func (s *NLBInstanceTestStack) ApplyNodeLabels(ctx context.Context, f *framework.Framework, node *corev1.Node, labels map[string]string) error {

diff --git a/test/e2e/service/nlb_instance_target_test.go b/test/e2e/service/nlb_instance_target_test.go
@@ -47,16 +47,15 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 			})
 
 			By("verifying AWS loadbalancer resources", func() {
-				nodeList := &corev1.NodeList{}
-				err := tf.K8sClient.List(ctx, nodeList)
+				nodeList, err := stack.GetWorkerNodes(ctx, tf)
 				Expect(err).ToNot(HaveOccurred())
 				err = verifyAWSLoadBalancerResources(ctx, tf, lbARN, LoadBalancerExpectation{
 					Type:         "network",
 					Scheme:       "internet-facing",
 					TargetType:   "instance",
 					Listeners:    stack.resourceStack.getListenersPortMap(),
 					TargetGroups: stack.resourceStack.getTargetGroupNodePortMap(),
-					NumTargets:   len(nodeList.Items),
+					NumTargets:   len(nodeList),
 					TargetGroupHC: &TargetGroupHC{
 						Protocol:           "TCP",
 						Port:               "traffic-port",
@@ -69,10 +68,9 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 				Expect(err).NotTo(HaveOccurred())
 			})
 			By("waiting for target group targets to be healthy", func() {
-				nodeList := &corev1.NodeList{}
-				err := tf.K8sClient.List(ctx, nodeList)
+				nodeList, err := stack.GetWorkerNodes(ctx, tf)
 				Expect(err).ToNot(HaveOccurred())
-				err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList.Items))
+				err = waitUntilTargetsAreHealthy(ctx, tf, lbARN, len(nodeList))
 				Expect(err).NotTo(HaveOccurred())
 			})
 			By("waiting until DNS name is available", func() {
@@ -174,16 +172,15 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 				Expect(lbARN).ToNot(BeEmpty())
 			})
 			By("verifying AWS loadbalancer resources", func() {
-				nodeList := &corev1.NodeList{}
-				err := tf.K8sClient.List(ctx, nodeList)
+				nodeList, err := stack.GetWorkerNodes(ctx, tf)
 				Expect(err).ToNot(HaveOccurred())
 				err = verifyAWSLoadBalancerResources(ctx, tf, lbARN, LoadBalancerExpectation{
 					Type:         "network",
 					Scheme:       "internal",
 					TargetType:   "instance",
 					Listeners:    stack.resourceStack.getListenersPortMap(),
 					TargetGroups: stack.resourceStack.getTargetGroupNodePortMap(),
-					NumTargets:   len(nodeList.Items),
+					NumTargets:   len(nodeList),
 					TargetGroupHC: &TargetGroupHC{
 						Protocol:           "TCP",
 						Port:               "traffic-port",