Shut down webhook after apiserver

This commit is contained in:
Joe Betz 2024-12-12 19:01:42 -05:00
parent bfe431b53e
commit a69efaeb76

View File

@ -200,24 +200,24 @@ func (sf selectableFieldTestCase) Name() string {
} }
func TestSelectableFields(t *testing.T) { 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) _, ctx := ktesting.NewTestContext(t)
tearDown, apiExtensionClient, dynamicClient, err := fixtures.StartDefaultServerWithClients(t) tearDown, apiExtensionClient, dynamicClient, err := fixtures.StartDefaultServerWithClients(t)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer tearDown() t.Cleanup(tearDown)
crd := selectableFieldFixture.DeepCopy() 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 { if webhookClientConfig != nil {
crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{ crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{
Strategy: apiextensionsv1.WebhookConverter, Strategy: apiextensionsv1.WebhookConverter,