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

TestSelectableFields flake: Shut down webhook after apiserver

Author: k8s-ci-robot

staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go

@@ -200,23 +200,23 @@ func (sf selectableFieldTestCase) Name() string {
 }
 
 func TestSelectableFields(t *testing.T) {
-	_, ctx := ktesting.NewTestContext(t)
-	tearDown, apiExtensionClient, dynamicClient, err := fixtures.StartDefaultServerWithClients(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)
 	}
-	defer tearDown()
-
-	crd := selectableFieldFixture.DeepCopy()
+	t.Cleanup(whTearDown)
 
-	// start a conversion webhook
-	handler := conversion.NewObjectConverterWebhookHandler(t, crdConverter)
-	upCh, handler := closeOnCall(handler)
-	tearDown, webhookClientConfig, err := conversion.StartConversionWebhookServer(handler)
+	_, 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()
 
 	if webhookClientConfig != nil {
 		crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{