From a4fe5e0295b68b640595b61921fcbad9ea47daf1 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 17 Mar 2026 09:12:04 -0400 Subject: [PATCH] test/integration/apiserver/discovery: give convergence more time The discovery integration tests can time out while waiting for APIService cleanup and group-version removal to converge. In CI this shows up in TestCRD/Race and TestCRD/CRDAPIServiceSameGroupDifferentVersions while waiting for stale discovery state to disappear. Increase the shared discovery timeout so the tests continue to verify the same cleanup and convergence behavior with more headroom on slower runners. --- test/integration/apiserver/discovery/framework.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/apiserver/discovery/framework.go b/test/integration/apiserver/discovery/framework.go index bb335f885d7..3e8801d2e98 100644 --- a/test/integration/apiserver/discovery/framework.go +++ b/test/integration/apiserver/discovery/framework.go @@ -46,7 +46,9 @@ const acceptV1JSON = "application/json" const acceptV2JSON = "application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList" const acceptV2JSONNoPeer = "application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList;profile=nopeer" -const maxTimeout = 30 * time.Second +// Discovery integration tests frequently need to wait through aggregator, +// API registration, and discovery document convergence on contended CI nodes. +const maxTimeout = 120 * time.Second type testClient interface { kubernetes.Interface