e2e: export both GetLoadBalancerFromDNSNameWithRetry and WithTImeout

Author: mtulio

tests/e2e/helper_aws.go

@@ -34,6 +34,10 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 )
 
+const (
+	DefaultRetryTimeoutMinutes = 20
+)
+
 // awsHelper provides AWS API operations for e2e tests
 type E2ETestHelperAWS struct {
 	ctx context.Context
@@ -161,7 +165,7 @@ func (h *E2ETestHelperAWS) GetELBV2Client() *elbv2.Client {
 // - Verify count matches number of worker nodes
 func (h *E2ETestHelperAWS) GetLBTargetCount(lbDNSName string, expectedTargets int) error {
 	// Get Load Balancer ARN from DNS name
-	foundLB, err := h.GetLoadBalancerFromDNSNameWithRetry(lbDNSName, 10*time.Minute)
+	foundLB, err := h.GetLoadBalancerFromDNSNameWithRetry(lbDNSName)
 	if err != nil {
 		return fmt.Errorf("failed to get load balancer from DNS name: %v", err)
 	}
@@ -244,9 +248,10 @@ func (h *E2ETestHelperAWS) GetLoadBalancerFromDNSName(lbDNSName string) (*elbv2t
 	return foundLB, nil
 }
 
-// GetLoadBalancerFromDNSNameWithRetry describes a load balancers filtered by DNS name with retry using
+// GetLoadBalancerFromDNSNameWithTimeout describes a load balancers filtered by DNS name with retry using
 // exponential backoff.
-func (h *E2ETestHelperAWS) GetLoadBalancerFromDNSNameWithRetry(lbDNSName string, timeout time.Duration) (*elbv2types.LoadBalancer, error) {
+// AWS API
+func (h *E2ETestHelperAWS) GetLoadBalancerFromDNSNameWithTimeout(lbDNSName string, timeout time.Duration) (*elbv2types.LoadBalancer, error) {
 	var foundLB *elbv2types.LoadBalancer
 
 	ctx, cancel := context.WithTimeout(h.ctx, timeout)
@@ -275,3 +280,11 @@ func (h *E2ETestHelperAWS) GetLoadBalancerFromDNSNameWithRetry(lbDNSName string,
 
 	return foundLB, nil
 }
+
+// GetLoadBalancerFromDNSNameWithRetry describes a load balancers filtered by DNS name with
+// default retry values.
+// The default timeout is 20 minutes based on the AWS API limits and different regions
+// where DNS propagation.
+func (h *E2ETestHelperAWS) GetLoadBalancerFromDNSNameWithRetry(lbDNSName string) (*elbv2types.LoadBalancer, error) {
+	return h.GetLoadBalancerFromDNSNameWithTimeout(lbDNSName, DefaultRetryTimeoutMinutes*time.Minute)
+}

tests/e2e/loadbalancer.go

@@ -17,7 +17,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
@@ -181,7 +180,7 @@ var _ = Describe("[cloud-provider-aws-e2e] loadbalancer", func() {
 
 				// DescribeLoadBalancers API doesn't support filtering by DNS name directly
 				// Use AWS SDK paginator to search through all load balancers
-				foundLB, err := e2e.GetAWSHelper().GetLoadBalancerFromDNSNameWithRetry(hostAddr, 10*time.Minute)
+				foundLB, err := e2e.GetAWSHelper().GetLoadBalancerFromDNSNameWithRetry(hostAddr)
 				if err != nil {
 					e2e.GatherEventsOnFailure("Target Group Attributes Validation Failure")
 					framework.Failf("failed to find load balancer with DNS name %s: %v", hostAddr, err)