Skip to content

Commit e5a4a04

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

File tree

8 files changed

+5
-1232
lines changed

8 files changed

+5
-1232
lines changed

pkg/builder/webhook.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,8 @@ func (blder *WebhookBuilder) getDefaultingWebhook() *admission.Webhook {
176176
}
177177
return w
178178
}
179-
if defaulter, ok := blder.apiType.(admission.Defaulter); ok {
180-
w := admission.DefaultingWebhookFor(blder.mgr.GetScheme(), defaulter)
181-
if blder.recoverPanic != nil {
182-
w = w.WithRecoverPanic(*blder.recoverPanic)
183-
}
184-
return w
185-
}
186179
log.Info(
187-
"skip registering a mutating webhook, object does not implement admission.Defaulter or WithDefaulter wasn't called",
180+
"skip registering a mutating webhook, object does not implement admission.CustomDefaulter or WithCustomDefaulter wasn't called",
188181
"GVK", blder.gvk)
189182
return nil
190183
}
@@ -215,15 +208,8 @@ func (blder *WebhookBuilder) getValidatingWebhook() *admission.Webhook {
215208
}
216209
return w
217210
}
218-
if validator, ok := blder.apiType.(admission.Validator); ok {
219-
w := admission.ValidatingWebhookFor(blder.mgr.GetScheme(), validator)
220-
if blder.recoverPanic != nil {
221-
w = w.WithRecoverPanic(*blder.recoverPanic)
222-
}
223-
return w
224-
}
225211
log.Info(
226-
"skip registering a validating webhook, object does not implement admission.Validator or WithValidator wasn't called",
212+
"skip registering a validating webhook, object does not implement admission.CustomValidator or WithCustomValidator wasn't called",
227213
"GVK", blder.gvk)
228214
return nil
229215
}

0 commit comments

Comments
 (0)