mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
Merge pull request #129192 from jpbetz/selectable-fields-flake
TestSelectableFields flake: Shut down webhook after apiserver
This commit is contained in:
commit
e7b40fd1b2
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user