Skip to content

Commit 1c3cb32

Browse files
committed
remove deprecated Defaulter and Validator interfaces
Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
1 parent 3299760 commit 1c3cb32

File tree

7 files changed

+5
-789
lines changed

7 files changed

+5
-789
lines changed

pkg/builder/webhook.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,8 @@ func (blder *WebhookBuilder) getDefaultingWebhook() *admission.Webhook {
171171
if defaulter := blder.customDefaulter; defaulter != nil {
172172
return admission.WithCustomDefaulter(blder.mgr.GetScheme(), blder.apiType, defaulter).WithRecoverPanic(blder.recoverPanic)
173173
}
174-
if defaulter, ok := blder.apiType.(admission.Defaulter); ok {
175-
return admission.DefaultingWebhookFor(blder.mgr.GetScheme(), defaulter).WithRecoverPanic(blder.recoverPanic)
176-
}
177174
log.Info(
178-
"skip registering a mutating webhook, object does not implement admission.Defaulter or WithDefaulter wasn't called",
175+
"skip registering a mutating webhook, object does not implement admission.CustomDefaulter or WithCustomDefaulter wasn't called",
179176
"GVK", blder.gvk)
180177
return nil
181178
}
@@ -202,11 +199,8 @@ func (blder *WebhookBuilder) getValidatingWebhook() *admission.Webhook {
202199
if validator := blder.customValidator; validator != nil {
203200
return admission.WithCustomValidator(blder.mgr.GetScheme(), blder.apiType, validator).WithRecoverPanic(blder.recoverPanic)
204201
}
205-
if validator, ok := blder.apiType.(admission.Validator); ok {
206-
return admission.ValidatingWebhookFor(blder.mgr.GetScheme(), validator).WithRecoverPanic(blder.recoverPanic)
207-
}
208202
log.Info(
209-
"skip registering a validating webhook, object does not implement admission.Validator or WithValidator wasn't called",
203+
"skip registering a validating webhook, object does not implement admission.CustomValidator or WithCustomValidator wasn't called",
210204
"GVK", blder.gvk)
211205
return nil
212206
}

pkg/webhook/admission/defaulter.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

pkg/webhook/admission/defaulter_test.go

Lines changed: 0 additions & 68 deletions
This file was deleted.

pkg/webhook/admission/validator.go

Lines changed: 0 additions & 127 deletions
This file was deleted.

pkg/webhook/admission/validator_custom.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ import (
2727
"k8s.io/apimachinery/pkg/runtime"
2828
)
2929

30+
// Warnings represents warning messages.
31+
type Warnings []string
32+
3033
// CustomValidator defines functions for validating an operation.
3134
// The object to be validated is passed into methods as a parameter.
3235
type CustomValidator interface {

0 commit comments

Comments
 (0)