github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
commit e7b40fd1b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go
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,