From a69efaeb765075564295e63333bdc8d8a14c678e Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Thu, 12 Dec 2024 19:01:42 -0500 Subject: [PATCH] Shut down webhook after apiserver --- .../test/integration/fieldselector_test.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go index f40872ffec2..83aba5ad9a2 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go @@ -200,24 +200,24 @@ func (sf selectableFieldTestCase) Name() string { } func TestSelectableFields(t *testing.T) { + // start a conversion webhook + handler := conversion.NewObjectConverterWebhookHandler(t, crdConverter) + upCh, handler := closeOnCall(handler) + whTearDown, webhookClientConfig, err := conversion.StartConversionWebhookServer(handler) + if err != nil { + t.Fatal(err) + } + t.Cleanup(whTearDown) + _, ctx := ktesting.NewTestContext(t) tearDown, apiExtensionClient, dynamicClient, err := fixtures.StartDefaultServerWithClients(t) if err != nil { t.Fatal(err) } - defer tearDown() + t.Cleanup(tearDown) crd := selectableFieldFixture.DeepCopy() - // start a conversion webhook - handler := conversion.NewObjectConverterWebhookHandler(t, crdConverter) - upCh, handler := closeOnCall(handler) - tearDown, webhookClientConfig, err := conversion.StartConversionWebhookServer(handler) - if err != nil { - t.Fatal(err) - } - defer tearDown() - if webhookClientConfig != nil { crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{ Strategy: apiextensionsv1.WebhookConverter,