From 59c805a690491246a2637552fa3f58a0eb72b6ff Mon Sep 17 00:00:00 2001 From: Tim Ebert Date: Tue, 12 Oct 2021 11:33:26 +0200 Subject: [PATCH] Drop setting webhook gvk explicitly in envtest webhookConfig.SetGroupVersionKind is not needed anymore with kubernetes-sigs/controller-runtime#1665 --- .../seedadmission_suite_test.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/integration/envtest/seedadmissioncontroller/seedadmission_suite_test.go b/test/integration/envtest/seedadmissioncontroller/seedadmission_suite_test.go index 29b6f17430d..57e24a8b81e 100644 --- a/test/integration/envtest/seedadmissioncontroller/seedadmission_suite_test.go +++ b/test/integration/envtest/seedadmissioncontroller/seedadmission_suite_test.go @@ -117,11 +117,7 @@ func getValidatingWebhookConfig() *admissionregistrationv1.ValidatingWebhookConf }, } - webhookConfig := seedadmissioncontroller.GetValidatingWebhookConfig(nil, service) - // envtest doesn't default the webhook config's GVK, so set it explicitly - webhookConfig.SetGroupVersionKind(admissionregistrationv1.SchemeGroupVersion.WithKind("ValidatingWebhookConfiguration")) - - return webhookConfig + return seedadmissioncontroller.GetValidatingWebhookConfig(nil, service) } func getMutatingWebhookConfig() *admissionregistrationv1.MutatingWebhookConfiguration { @@ -131,9 +127,5 @@ func getMutatingWebhookConfig() *admissionregistrationv1.MutatingWebhookConfigur }, } - webhookConfig := gardenerkubescheduler.GetMutatingWebhookConfig(clientConfig) - // envtest doesn't default the webhook config's GVK, so set it explicitly - webhookConfig.SetGroupVersionKind(admissionregistrationv1.SchemeGroupVersion.WithKind("MutatingWebhookConfiguration")) - - return webhookConfig + return gardenerkubescheduler.GetMutatingWebhookConfig(clientConfig) }