fix: envoy shutdown flaky test (envoyproxy#3646)

delay readdiness to allow XDS sync Signed-off-by: Guy Daich <[email protected]> Signed-off-by: “bjlhlin” <“[email protected]”> Signed-off-by: bjlhlin <[email protected]>
bjlhlin · Jun 24, 2024 · 622ae44 · 622ae44
1 parent f1ed4fe
commit 622ae44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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 {