From 5ea7a67aa32c837d890e0066d8a6aff35b7f1817 Mon Sep 17 00:00:00 2001 From: Guy Daich Date: Fri, 21 Jun 2024 13:22:38 -0500 Subject: [PATCH] delay readdiness to allow XDS sync Signed-off-by: Guy Daich --- test/config/gatewayclass.yaml | 10 ++++++++++ test/e2e/upgrade/eg_upgrade_test.go | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/config/gatewayclass.yaml b/test/config/gatewayclass.yaml index ad5ce4fefe4..b1051086659 100644 --- a/test/config/gatewayclass.yaml +++ b/test/config/gatewayclass.yaml @@ -106,6 +106,16 @@ spec: kubernetes: envoyDeployment: replicas: 2 + patch: + type: StrategicMerge + value: + spec: + template: + spec: + containers: + - name: envoy + readinessProbe: + initialDelaySeconds: 5 --- kind: GatewayClass apiVersion: gateway.networking.k8s.io/v1 diff --git a/test/e2e/upgrade/eg_upgrade_test.go b/test/e2e/upgrade/eg_upgrade_test.go index 78a417cc179..ec043318915 100644 --- a/test/e2e/upgrade/eg_upgrade_test.go +++ b/test/e2e/upgrade/eg_upgrade_test.go @@ -56,8 +56,7 @@ func TestEGUpgrade(t *testing.T) { // All e2e tests should leave Features empty. SupportedFeatures: sets.New[features.SupportedFeature](features.SupportGateway), SkipTests: []string{ - tests.EnvoyShutdownTest.ShortName, // https://github.com/envoyproxy/gateway/issues/3262 - tests.EGUpgradeTest.ShortName, // https://github.com/envoyproxy/gateway/issues/3311 + tests.EGUpgradeTest.ShortName, // https://github.com/envoyproxy/gateway/issues/3311 }, }) if err != nil {