Task 10: Address propagation delay in tests

Ryan Lymburner · Ryan Lymburner · commit 209aa8e0cc59 · 2025-08-08T10:45:34.000-07:00
diff --git a/Makefile b/Makefile
@@ -120,12 +120,12 @@ e2e-test: ## Run e2e tests against cluster pointed to by ~/.kube/config
 	cd test && go test \
 		-p 1 \
 		-count 1 \
-		-timeout 90m \
+		-timeout 120m \
 		-v \
 		./suites/integration/... \
 		--ginkgo.focus="${FOCUS}" \
 		--ginkgo.skip="${SKIP}" \
-		--ginkgo.timeout=90m \
+		--ginkgo.timeout=120m \
 		--ginkgo.v
 
 .SILENT:
diff --git a/go.mod b/go.mod
@@ -58,7 +58,6 @@ require (
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.38.0 // indirect
diff --git a/go.sum b/go.sum
@@ -127,8 +127,6 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
diff --git a/pkg/deploy/lattice/health_check_resolver_test.go b/pkg/deploy/lattice/health_check_resolver_test.go
@@ -75,7 +75,7 @@ func TestHealthCheckConfigResolver_ResolveHealthCheckConfig(t *testing.T) {
 
 			// Create scheme and add required types
 			scheme := runtime.NewScheme()
-			_ = anv1alpha1.AddToScheme(scheme)
+			_ = anv1alpha1.Install(scheme)
 			_ = corev1.AddToScheme(scheme)
 
 			// Create fake client with no objects
@@ -434,9 +434,9 @@ func Test_ResolveHealthCheckConfig_WithPolicies(t *testing.T) {
 
 			// Create scheme and add required types
 			scheme := runtime.NewScheme()
-			_ = anv1alpha1.AddToScheme(scheme)
+			_ = anv1alpha1.Install(scheme)
 			_ = corev1.AddToScheme(scheme)
-			_ = gwv1alpha2.AddToScheme(scheme)
+			_ = gwv1alpha2.Install(scheme)
 
 			// Convert policies to client.Object slice
 			objects := make([]client.Object, len(tt.policies))
diff --git a/pkg/deploy/lattice/target_group_manager_test.go b/pkg/deploy/lattice/target_group_manager_test.go
@@ -1407,9 +1407,9 @@ func Test_update_ServiceExportWithPolicyResolution(t *testing.T) {
 
 			// Create scheme and add required types
 			scheme := runtime.NewScheme()
-			_ = anv1alpha1.AddToScheme(scheme)
+			_ = anv1alpha1.Install(scheme)
 			_ = corev1.AddToScheme(scheme)
-			_ = gwv1alpha2.AddToScheme(scheme)
+			_ = gwv1alpha2.Install(scheme)
 
 			// Create fake client with policy if provided
 			clientBuilder := fake.NewClientBuilder().WithScheme(scheme)
@@ -1595,7 +1595,7 @@ func Test_update_BackwardsCompatibility(t *testing.T) {
 			if tt.client {
 				// Create scheme and add required types
 				scheme := runtime.NewScheme()
-				_ = anv1alpha1.AddToScheme(scheme)
+				_ = anv1alpha1.Install(scheme)
 				_ = corev1.AddToScheme(scheme)
 				k8sClient = fake.NewClientBuilder().WithScheme(scheme).Build()
 			}
diff --git a/pkg/k8s/policyhelper/policy_test.go b/pkg/k8s/policyhelper/policy_test.go
@@ -262,9 +262,9 @@ func Test_FindPolicyForService_ServiceBasedResolution(t *testing.T) {
 
 			// Create scheme and add required types
 			scheme := runtime.NewScheme()
-			_ = anv1alpha1.AddToScheme(scheme)
+			_ = anv1alpha1.Install(scheme)
 			_ = corev1.AddToScheme(scheme)
-			_ = gwv1alpha2.AddToScheme(scheme)
+			_ = gwv1alpha2.Install(scheme)
 
 			// Convert policies to client.Object slice
 			objects := make([]client.Object, len(tt.policies))
diff --git a/test/pkg/test/framework.go b/test/pkg/test/framework.go
@@ -143,7 +143,7 @@ func NewFramework(ctx context.Context, log gwlog.Logger, testNamespace string) *
 	}
 	framework.Cloud = anaws.NewDefaultCloud(framework.LatticeClient, cloudConfig)
 	framework.DefaultTags = framework.Cloud.DefaultTags()
-	SetDefaultEventuallyTimeout(3 * time.Minute)
+	SetDefaultEventuallyTimeout(5 * time.Minute)
 	SetDefaultEventuallyPollingInterval(10 * time.Second)
 	return framework
 }
diff --git a/test/suites/integration/access_log_policy_test.go b/test/suites/integration/access_log_policy_test.go
@@ -87,9 +87,6 @@ var _ = Describe("Access Log Policy", Ordered, func() {
 	)
 
 	BeforeAll(func() {
-		SetDefaultEventuallyTimeout(5 * time.Minute)
-		SetDefaultEventuallyPollingInterval(10 * time.Second)
-
 		awsResourceName = awsResourceNamePrefix + utils.RandomAlphaString(10)
 
 		tags := testFramework.NewTestTags(testSuite)
diff --git a/test/suites/integration/byoc_test.go b/test/suites/integration/byoc_test.go
@@ -103,7 +103,7 @@ var _ = Describe("Bring your own certificate (BYOC)", Ordered, func() {
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("byoc-app handler pod"))
 			g.Expect(stderr).To(ContainSubstring("issuer: O=byoc-e2e-test"))
-		}).WithTimeout(30 * time.Second).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 	})
 
 	AfterAll(func() {
diff --git a/test/suites/integration/grpcroute_serviceexport_test.go b/test/suites/integration/grpcroute_serviceexport_test.go
@@ -1,10 +1,6 @@
 package integration
 
 import (
-	"log"
-	"os"
-	"time"
-
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
 	"github.com/aws/aws-sdk-go/aws"
@@ -15,6 +11,8 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"log"
+	"os"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
@@ -29,11 +27,6 @@ var _ = Describe("GRPCRoute Service Export/Import Test", Ordered, func() {
 		serviceImport  *anv1alpha1.ServiceImport
 	)
 
-	BeforeAll(func() {
-		SetDefaultEventuallyTimeout(5 * time.Minute)
-		SetDefaultEventuallyPollingInterval(10 * time.Second)
-	})
-
 	It("Create k8s resource", func() {
 		// Create a gRPC service and deployment
 		grpcDeployment, grpcSvc = testFramework.NewGrpcHelloWorld(test.GrpcAppOptions{AppName: "my-grpc-exportedports", Namespace: k8snamespace})
@@ -119,7 +112,7 @@ var _ = Describe("GRPCRoute Service Export/Import Test", Ordered, func() {
 			for _, target := range targets {
 				g.Expect(*target.Port).To(BeEquivalentTo(grpcSvc.Spec.Ports[0].TargetPort.IntVal))
 			}
-		}).WithTimeout(3 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 
 		log.Println("Verifying traffic")
 		grpcurlCmdOptions := test.RunGrpcurlCmdOptions{
diff --git a/test/suites/integration/grpcroute_test.go b/test/suites/integration/grpcroute_test.go
@@ -32,9 +32,6 @@ var _ = Describe("GRPCRoute test", Ordered, func() {
 		grpcBinDeployment, grpcBinService = testFramework.NewGrpcBin(test.GrpcAppOptions{AppName: "my-grpcbin-1", Namespace: k8snamespace})
 		grpcHelloWorldDeployment, grpcHelloWorldService = testFramework.NewGrpcHelloWorld(test.GrpcAppOptions{AppName: "my-grpc-hello-world-1", Namespace: k8snamespace})
 		testFramework.ExpectCreated(ctx, grpcBinDeployment, grpcBinService, grpcHelloWorldDeployment, grpcHelloWorldService)
-
-		SetDefaultEventuallyTimeout(5 * time.Minute)
-		SetDefaultEventuallyPollingInterval(10 * time.Second)
 	})
 
 	When("Create a grpcRoute that have one rule with no matches BackendRef to grpcBinService", func() {
diff --git a/test/suites/integration/httproute_header_match_test.go b/test/suites/integration/httproute_header_match_test.go
@@ -2,17 +2,15 @@ package integration
 
 import (
 	"fmt"
-	"log"
-	"regexp"
-	"time"
-
 	"github.com/aws/aws-sdk-go/service/vpclattice"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/samber/lo"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"log"
+	"regexp"
 
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
@@ -88,15 +86,15 @@ var _ = Describe("HTTPRoute header matches", func() {
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("test-v3 handler pod"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 
 		// check incorrect headers
 		Eventually(func(g Gomega) {
 			invalidCmd := fmt.Sprintf("curl %s -H \"my-header-name1: my-header-value1\" -H \"my-header-name2: value2-invalid\"", dnsName)
 			stdout, _, err := testFramework.PodExec(pod, invalidCmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("Not Found"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 	})
 
 	AfterEach(func() {
diff --git a/test/suites/integration/httproute_method_match_test.go b/test/suites/integration/httproute_method_match_test.go
@@ -2,9 +2,6 @@ package integration
 
 import (
 	"fmt"
-	"log"
-	"time"
-
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
 	"github.com/aws/aws-sdk-go/service/vpclattice"
@@ -14,10 +11,11 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"log"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
-var _ = Describe("HTTPRoute method matches", func() {
+var _ = Describe("HTTPRoute method matches", Ordered, func() {
 
 	var (
 		methodMatchHttpRoute *gwv1.HTTPRoute
@@ -109,21 +107,21 @@ var _ = Describe("HTTPRoute method matches", func() {
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("test-get handler pod"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 
 		Eventually(func(g Gomega) {
 			cmd := fmt.Sprintf("curl -X POST %s", dnsName)
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("test-post handler pod"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 
 		Eventually(func(g Gomega) {
 			invalidCmd := fmt.Sprintf("curl -X DELETE %s", dnsName)
 			stdout, _, err := testFramework.PodExec(pod, invalidCmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("Not Found"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 	})
 
 	AfterEach(func() {
diff --git a/test/suites/integration/httproute_path_match_test.go b/test/suites/integration/httproute_path_match_test.go
@@ -2,17 +2,15 @@ package integration
 
 import (
 	"fmt"
-	"log"
-	"os"
-	"time"
-
 	"github.com/aws/aws-sdk-go/service/vpclattice"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/samber/lo"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"log"
+	"os"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
@@ -137,14 +135,14 @@ var _ = Describe("HTTPRoute path matches", func() {
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("test-v1 handler pod"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 
 		Eventually(func(g Gomega) {
 			cmd := fmt.Sprintf("curl %s/pathmatch1", dnsName)
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("test-v2 handler pod"))
-		}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 	})
 
 	AfterEach(func() {
diff --git a/test/suites/integration/https_listener_weighted_rule_with_service_export_import_test.go b/test/suites/integration/https_listener_weighted_rule_with_service_export_import_test.go
@@ -2,10 +2,6 @@ package integration
 
 import (
 	"fmt"
-	"log"
-	"os"
-	"time"
-
 	anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
@@ -15,10 +11,12 @@ import (
 	"github.com/samber/lo"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
+	"log"
+	"os"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
-var _ = Describe("Test 2 listeners with weighted httproute rules and service export import", func() {
+var _ = Describe("Test 2 listeners with weighted httproute rules and service export import", Ordered, func() {
 	var (
 		deployment0    *appsv1.Deployment
 		deployment1    *appsv1.Deployment
@@ -114,7 +112,7 @@ var _ = Describe("Test 2 listeners with weighted httproute rules and service exp
 					g.Expect(*retrievedWeightedTargetGroup1InRule.TargetGroupIdentifier).To(Equal(*retrievedTg1.Id))
 					g.Expect(*retrievedWeightedTargetGroup1InRule.Weight).To(BeEquivalentTo(80))
 				}
-			}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+			}).Should(Succeed())
 			log.Println("Verifying Weighted rule traffic")
 			dnsName := testFramework.GetVpcLatticeServiceDns(httpRoute.Name, httpRoute.Namespace)
 
@@ -138,7 +136,7 @@ var _ = Describe("Test 2 listeners with weighted httproute rules and service exp
 					stdout, _, err := testFramework.PodExec(pod, cmd)
 					g.Expect(err).To(BeNil())
 					g.Expect(stdout).To(ContainSubstring("handler pod"))
-				}).WithTimeout(2 * time.Minute).WithOffset(1).Should(Succeed())
+				}).Should(Succeed())
 			}
 		})
 
diff --git a/test/suites/integration/tlsroute_serviceexport_test.go b/test/suites/integration/tlsroute_serviceexport_test.go
@@ -2,11 +2,6 @@ package integration
 
 import (
 	"fmt"
-	"log"
-	"net"
-	"os"
-	"time"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/vpclattice"
 	. "github.com/onsi/ginkgo/v2"
@@ -17,6 +12,9 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"log"
+	"net"
+	"os"
 
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
@@ -111,7 +109,7 @@ var _ = Describe("TLSRoute Service Export/Import Test", Ordered, func() {
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("my-https-1 handler pod"))
-		}).WithTimeout(3 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 	})
 
 	AfterAll(func() {
diff --git a/test/suites/integration/tlsroute_test.go b/test/suites/integration/tlsroute_test.go
@@ -2,10 +2,6 @@ package integration
 
 import (
 	"fmt"
-	"net"
-	"os"
-	"time"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/vpclattice"
 	. "github.com/onsi/ginkgo/v2"
@@ -14,6 +10,8 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"net"
+	"os"
 
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
@@ -88,7 +86,7 @@ var _ = Describe("TLSRoute test", Ordered, func() {
 			stdout, _, err := testFramework.PodExec(pod, cmd)
 			g.Expect(err).To(BeNil())
 			g.Expect(stdout).To(ContainSubstring("my-https-1 handler pod"))
-		}).WithTimeout(3 * time.Minute).WithOffset(1).Should(Succeed())
+		}).Should(Succeed())
 	})
 
 	AfterAll(func() {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func NewFramework(ctx context.Context, log gwlog.Logger, testNamespace string) *`
`143`	`143`	`}`
`144`	`144`	`framework.Cloud = anaws.NewDefaultCloud(framework.LatticeClient, cloudConfig)`
`145`	`145`	`framework.DefaultTags = framework.Cloud.DefaultTags()`
`146`		`- SetDefaultEventuallyTimeout(3 * time.Minute)`
	`146`	`+ SetDefaultEventuallyTimeout(5 * time.Minute)`
`147`	`147`	`SetDefaultEventuallyPollingInterval(10 * time.Second)`
`148`	`148`	`return framework`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,6 @@ var _ = Describe("Access Log Policy", Ordered, func() {`
`87`	`87`	`)`
`88`	`88`
`89`	`89`	`BeforeAll(func() {`
`90`		`- SetDefaultEventuallyTimeout(5 * time.Minute)`
`91`		`- SetDefaultEventuallyPollingInterval(10 * time.Second)`
`92`		`-`
`93`	`90`	`awsResourceName = awsResourceNamePrefix + utils.RandomAlphaString(10)`
`94`	`91`
`95`	`92`	`tags := testFramework.NewTestTags(testSuite)`