From 9b4999b63ca90c53fb3dbe3c823b8ca7fa84ba3d Mon Sep 17 00:00:00 2001 From: Olivia Song Date: Thu, 16 May 2024 09:13:09 -0700 Subject: [PATCH] restrict dual-stack-without-ipv4 e2e test to pdx only (#3700) --- test/e2e/ingress/vanilla_ingress_test.go | 7 ++++++- test/framework/utils/poll.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/e2e/ingress/vanilla_ingress_test.go b/test/e2e/ingress/vanilla_ingress_test.go index 0e5bfc004..d83bde27f 100644 --- a/test/e2e/ingress/vanilla_ingress_test.go +++ b/test/e2e/ingress/vanilla_ingress_test.go @@ -745,7 +745,12 @@ var _ = Describe("vanilla ingress tests", func() { } if tf.Options.IPFamily == "IPv6" { - annotation["alb.ingress.kubernetes.io/ip-address-type"] = "dualstack-without-public-ipv4" + // TODO: annotate to "dualstack-without-public-ipv4" for all regions once it's GA + if tf.Options.AWSRegion == "us-west-2" { + annotation["alb.ingress.kubernetes.io/ip-address-type"] = "dualstack-without-public-ipv4" + } else { + annotation["alb.ingress.kubernetes.io/ip-address-type"] = "dualstack" + } } ing := ingBuilder. diff --git a/test/framework/utils/poll.go b/test/framework/utils/poll.go index e8b8e4a8e..8a793f8ad 100644 --- a/test/framework/utils/poll.go +++ b/test/framework/utils/poll.go @@ -13,5 +13,5 @@ const ( // IngressReconcileTimeout is the timeout we expected the controller finishes reconcile for Ingresses. IngressReconcileTimeout = 1 * time.Minute // IngressDNSAvailableWaitTimeout is the timeout we expect the DNS records of ALB to be propagated. - IngressDNSAvailableWaitTimeout = 5 * time.Minute + IngressDNSAvailableWaitTimeout = 10 * time.Minute )