From 019f68be5c40127a8d71b5669e36d543ab19ee7f Mon Sep 17 00:00:00 2001 From: shwetha-s-poojary Date: Tue, 10 Feb 2026 19:28:03 +0530 Subject: [PATCH] test: fix the flaking TestWebhookConversion_WhitespaceCABundleEtcdBypass --- .../test/integration/conversion/conversion_test.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go index f2abe7bd30e..317bb2ff97a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go @@ -1541,11 +1541,10 @@ func servedVersions(versions []apiextensionsv1.CustomResourceDefinitionVersion) func TestWebhookConversion_WhitespaceCABundleEtcdBypass(t *testing.T) { // Setup server and clients - tearDown, config, options, err := fixtures.StartDefaultServer(t) + apiServerTearDown, config, options, err := fixtures.StartDefaultServer(t) if err != nil { t.Fatal(err) } - defer tearDown() apiExtensionsClient, err := clientset.NewForConfig(config) if err != nil { @@ -1591,11 +1590,17 @@ func TestWebhookConversion_WhitespaceCABundleEtcdBypass(t *testing.T) { verifyMultiVersionObject(t, "v1beta1", obj) // Set up webhook conversion - tearDown, webhookClientConfig, err := StartConversionWebhookServer(NewObjectConverterWebhookHandler(t, noopConverter)) + webhookTearDown, webhookClientConfig, err := StartConversionWebhookServer(NewObjectConverterWebhookHandler(t, noopConverter)) if err != nil { t.Fatal(err) } - defer tearDown() + + t.Cleanup(func() { + // Ensure conversion webhook remains available until the apiserver + // and its etcd watches are fully shut down. + apiServerTearDown() + webhookTearDown() + }) crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{ Strategy: apiextensionsv1.WebhookConverter,