Merge branch 'main' into envoy-1.32-bump2

solo-io · Feb 12, 2025 · 6c368f1 · 6c368f1
2 parents 8e5df8c + d4fa277
commit 6c368f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog/v1.19.0-beta7/flake-improve-nooneway-failures.yaml b/changelog/v1.19.0-beta7/flake-improve-nooneway-failures.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: NON_USER_FACING
+    description: |
+      Adjusted timeout in an effort to reduce failures of these tests.
+    issueLink: https://github.com/solo-io/solo-projects/issues/7685
+    resolvesIssue: false
diff --git a/test/kubernetes/e2e/features/server_tls/k8s_suite.go b/test/kubernetes/e2e/features/server_tls/k8s_suite.go
@@ -130,5 +130,6 @@ func (s *k8sServerTlsTestingSuite) assertEventualError(hostHeaderValue string, c
 			Container: "curl",
 		},
 		append(curlOptions("gloo-proxy-gw", s.ns, hostHeaderValue), curl.WithPath("/status/200")),
-		code)
+		code,
+		time.Minute*2)
 }