Adapt webhook admission to accept mgr.GetScheme() as first argument.

kubernetes-sigs/controller-runtime#2134
ary1992 · Jun 23, 2023 · a166665 · a166665
1 parent 88c8bc6
commit a166665
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/pkg/admissioncontroller/webhook/admission/internaldomainsecret/add.go b/pkg/admissioncontroller/webhook/admission/internaldomainsecret/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomValidator(&corev1.Secret{}, h).
+		WithCustomValidator(mgr.GetScheme(), &corev1.Secret{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/admissioncontroller/webhook/admission/kubeconfigsecret/add.go b/pkg/admissioncontroller/webhook/admission/kubeconfigsecret/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomValidator(&corev1.Secret{}, h).
+		WithCustomValidator(mgr.GetScheme(), &corev1.Secret{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/admissioncontroller/webhook/admission/namespacedeletion/add.go b/pkg/admissioncontroller/webhook/admission/namespacedeletion/add.go
@@ -43,7 +43,7 @@ func (h *Handler) AddToManager(ctx context.Context, mgr manager.Manager) error {
 	}
 
 	webhook := admission.
-		WithCustomValidator(&corev1.Namespace{}, h).
+		WithCustomValidator(mgr.GetScheme(), &corev1.Namespace{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/operator/webhook/defaulting/add.go b/pkg/operator/webhook/defaulting/add.go
@@ -31,7 +31,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&operatorv1alpha1.Garden{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &operatorv1alpha1.Garden{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/operator/webhook/validation/add.go b/pkg/operator/webhook/validation/add.go
@@ -31,7 +31,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomValidator(&operatorv1alpha1.Garden{}, h).
+		WithCustomValidator(mgr.GetScheme(), &operatorv1alpha1.Garden{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/endpointslicehints/add.go b/pkg/resourcemanager/webhook/endpointslicehints/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&discoveryv1.EndpointSlice{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &discoveryv1.EndpointSlice{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/kubernetesservicehost/add.go b/pkg/resourcemanager/webhook/kubernetesservicehost/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Pod{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Pod{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/podschedulername/add.go b/pkg/resourcemanager/webhook/podschedulername/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Pod{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Pod{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/podtopologyspreadconstraints/add.go b/pkg/resourcemanager/webhook/podtopologyspreadconstraints/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Pod{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Pod{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/projectedtokenmount/add.go b/pkg/resourcemanager/webhook/projectedtokenmount/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Pod{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Pod{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/seccompprofile/add.go b/pkg/resourcemanager/webhook/seccompprofile/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Pod{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Pod{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/systemcomponentsconfig/add.go b/pkg/resourcemanager/webhook/systemcomponentsconfig/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Pod{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Pod{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)

diff --git a/pkg/resourcemanager/webhook/tokeninvalidator/add.go b/pkg/resourcemanager/webhook/tokeninvalidator/add.go
@@ -30,7 +30,7 @@ const (
 // AddToManager adds Handler to the given manager.
 func (h *Handler) AddToManager(mgr manager.Manager) error {
 	webhook := admission.
-		WithCustomDefaulter(&corev1.Secret{}, h).
+		WithCustomDefaulter(mgr.GetScheme(), &corev1.Secret{}, h).
 		WithRecoverPanic(true)
 
 	mgr.GetWebhookServer().Register(WebhookPath, webhook)