Drop setting webhook gvk explicitly in envtest

webhookConfig.SetGroupVersionKind is not needed anymore with kubernetes-sigs/controller-runtime#1665
timebertt · Oct 14, 2021 · 59c805a · 59c805a
1 parent 5d7d61b
commit 59c805a
Showing 1 changed file with 2 additions and 10 deletions.
diff --git 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)
 }