Merge pull request #129192 from jpbetz/selectable-fields-flake

TestSelectableFields flake: Shut down webhook after apiserver
This commit is contained in:
Kubernetes Prow Robot
2024-12-13 05:54:32 +01:00
committed by GitHub

View File

@@ -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,