From 618a0eea0c212138aad2f876595d377eb989b4fd Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Wed, 21 May 2025 23:40:40 -0600 Subject: [PATCH 1/3] NamespacesMustBeReady after GatewayAndHTTPRoutesMustBeAccepted Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com> --- test/e2e/tests/weighted_backend.go | 3 +++ test/e2e/tests/zone_aware_routing.go | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/tests/weighted_backend.go b/test/e2e/tests/weighted_backend.go index bea61448fc..440ebf55a7 100644 --- a/test/e2e/tests/weighted_backend.go +++ b/test/e2e/tests/weighted_backend.go @@ -66,6 +66,9 @@ func runWeightedBackendTest(t *testing.T, suite *suite.ConformanceTestSuite, rou suite.ControllerName, kubernetes.NewGatewayRef(SameNamespaceGateway), weightEqualRoute) + // make sure all backend resources are ready + kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{ConformanceInfraNamespace}) + expectedResponse := http.ExpectedResponse{ Request: http.Request{ Path: path, diff --git a/test/e2e/tests/zone_aware_routing.go b/test/e2e/tests/zone_aware_routing.go index 77958dcdb5..b7fb58c840 100644 --- a/test/e2e/tests/zone_aware_routing.go +++ b/test/e2e/tests/zone_aware_routing.go @@ -10,7 +10,6 @@ package tests import ( "testing" - "sigs.k8s.io/gateway-api/conformance/utils/kubernetes" "sigs.k8s.io/gateway-api/conformance/utils/suite" ) @@ -24,8 +23,6 @@ var ZoneAwareRoutingTest = suite.ConformanceTest{ Manifests: []string{"testdata/zone-aware-routing.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { t.Run("only local zone should get requests", func(t *testing.T) { - // Let's make sure that all the deployments are ready. - kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{"gateway-conformance-infra"}) // Pods from the backend-local deployment have affinity // for the Envoy Proxy pods so should receive all requests. From 65118ed2101b87a51089c9fb75cc389fe14c677d Mon Sep 17 00:00:00 2001 From: Jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 22 May 2025 00:40:17 -0600 Subject: [PATCH 2/3] lint Signed-off-by: Jukie <10012479+Jukie@users.noreply.github.com> --- test/e2e/tests/zone_aware_routing.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/tests/zone_aware_routing.go b/test/e2e/tests/zone_aware_routing.go index b7fb58c840..5ac6edc0fa 100644 --- a/test/e2e/tests/zone_aware_routing.go +++ b/test/e2e/tests/zone_aware_routing.go @@ -23,7 +23,6 @@ var ZoneAwareRoutingTest = suite.ConformanceTest{ Manifests: []string{"testdata/zone-aware-routing.yaml"}, Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { t.Run("only local zone should get requests", func(t *testing.T) { - // Pods from the backend-local deployment have affinity // for the Envoy Proxy pods so should receive all requests. expected := map[string]int{ From a6c3f5f18a44f704f7952c6f27675a0c7c8812a3 Mon Sep 17 00:00:00 2001 From: Jukie <10012479+Jukie@users.noreply.github.com> Date: Thu, 22 May 2025 09:19:48 -0600 Subject: [PATCH 3/3] trigger tests Signed-off-by: Jukie <10012479+Jukie@users.noreply.github.com> --- test/e2e/tests/weighted_backend.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/tests/weighted_backend.go b/test/e2e/tests/weighted_backend.go index 440ebf55a7..154c6f5fbf 100644 --- a/test/e2e/tests/weighted_backend.go +++ b/test/e2e/tests/weighted_backend.go @@ -66,7 +66,7 @@ func runWeightedBackendTest(t *testing.T, suite *suite.ConformanceTestSuite, rou suite.ControllerName, kubernetes.NewGatewayRef(SameNamespaceGateway), weightEqualRoute) - // make sure all backend resources are ready + // Make sure all test resources are ready kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{ConformanceInfraNamespace}) expectedResponse := http.ExpectedResponse{