Linting

Author: alvaroaleman

pkg/builder/webhook.go

@@ -64,7 +64,7 @@ func WebhookManagedBy[T runtime.Object](m manager.Manager, object T) *WebhookBui
 
 // WithDefaulter takes an admission.CustomDefaulter interface, a MutatingWebhook with the provided opts (admission.DefaulterOption)
 // will be wired for this type.
-// deprecated: Use WithAdmissionDefaulter instead.
+// Deprecated: Use WithAdmissionDefaulter instead.
 func (blder *WebhookBuilder[T]) WithDefaulter(defaulter admission.CustomDefaulter, opts ...admission.DefaulterOption) *WebhookBuilder[T] {
 	blder.customDefaulter = defaulter
 	blder.customDefaulterOpts = opts
@@ -79,7 +79,7 @@ func (blder *WebhookBuilder[T]) WithAdmissionDefaulter(defaulter admission.Defau
 }
 
 // WithValidator takes a admission.CustomValidator interface, a ValidatingWebhook will be wired for this type.
-// deprecated: Use WithAdmissionValidator instead.
+// Deprecated: Use WithAdmissionValidator instead.
 func (blder *WebhookBuilder[T]) WithValidator(validator admission.CustomValidator) *WebhookBuilder[T] {
 	blder.customValidator = validator
 	return blder
@@ -254,9 +254,6 @@ func (blder *WebhookBuilder[T]) getDefaultingWebhook() *admission.Webhook {
 		w = admission.WithDefaulter(blder.mgr.GetScheme(), blder.defaulter, blder.customDefaulterOpts...)
 	} else if customDefaulter := blder.customDefaulter; customDefaulter != nil {
 		w = admission.WithCustomDefaulter(blder.mgr.GetScheme(), blder.apiType, customDefaulter, blder.customDefaulterOpts...)
-		if blder.recoverPanic != nil {
-		}
-		return w
 	}
 	if w != nil && blder.recoverPanic != nil {
 		w = w.WithRecoverPanic(*blder.recoverPanic)
@@ -298,12 +295,11 @@ func (blder *WebhookBuilder[T]) getValidatingWebhook() *admission.Webhook {
 		w = admission.WithValidator(blder.mgr.GetScheme(), validator)
 	} else if customValidator := blder.customValidator; customValidator != nil {
 		w = admission.WithCustomValidator(blder.mgr.GetScheme(), blder.apiType, customValidator)
-		return w
 	}
 	if w != nil && blder.recoverPanic != nil {
 		w = w.WithRecoverPanic(*blder.recoverPanic)
 	}
-	return nil
+	return w
 }
 
 func (blder *WebhookBuilder[T]) registerConversionWebhook() error {

pkg/webhook/admission/defaulter_custom.go

@@ -36,6 +36,7 @@ type Defaulter[T runtime.Object] interface {
 	Default(ctx context.Context, obj T) error
 }
 
+// CustomDefaulter defines functions for setting defaults on resources.
 // Deprecated: CustomDefaulter is deprecated, use Defaulter instead
 type CustomDefaulter = Defaulter[runtime.Object]
 
@@ -53,7 +54,7 @@ func DefaulterRemoveUnknownOrOmitableFields(o *defaulterOptions) {
 	o.removeUnknownOrOmitableFields = true
 }
 
-// WithDefaulter creates a new Webhook for a CustomDefaulter interface.
+// WithDefaulter creates a new Webhook for a Defaulter interface.
 func WithDefaulter[T runtime.Object](scheme *runtime.Scheme, defaulter Defaulter[T], opts ...DefaulterOption) *Webhook {
 	options := &defaulterOptions{}
 	for _, o := range opts {
@@ -69,6 +70,7 @@ func WithDefaulter[T runtime.Object](scheme *runtime.Scheme, defaulter Defaulter
 	}
 }
 
+// WithCustomDefaulter creates a new Webhook for a CustomDefaulter interface.
 func WithCustomDefaulter(scheme *runtime.Scheme, obj runtime.Object, defaulter CustomDefaulter, opts ...DefaulterOption) *Webhook {
 	options := &defaulterOptions{}
 	for _, o := range opts {

pkg/webhook/admission/validator_custom.go

@@ -30,7 +30,7 @@ import (
 // Warnings represents warning messages.
 type Warnings []string
 
-// CustomValidator defines functions for validating an operation.
+// Validator defines functions for validating an operation.
 // The object to be validated is passed into methods as a parameter.
 type Validator[T runtime.Object] interface {
 	// ValidateCreate validates the object on creation.
@@ -49,7 +49,8 @@ type Validator[T runtime.Object] interface {
 	ValidateDelete(ctx context.Context, obj T) (warnings Warnings, err error)
 }
 
-// deprecated: CustomValidator is deprecated, use Validator instead
+// CustomValidator defines functions for validating an operation.
+// Deprecated: CustomValidator is deprecated, use Validator instead
 type CustomValidator = Validator[runtime.Object]
 
 // WithValidator creates a new Webhook for validating the provided type.
@@ -63,7 +64,8 @@ func WithValidator[T runtime.Object](scheme *runtime.Scheme, validator Validator
 	}
 }
 
-// deprecated: WithCustomValidator is deprecated, use WithValidator instead
+// WithCustomValidator creates a new Webhook for a CustomValidator.
+// Deprecated: WithCustomValidator is deprecated, use WithValidator instead
 func WithCustomValidator(scheme *runtime.Scheme, obj runtime.Object, validator CustomValidator) *Webhook {
 	return &Webhook{
 		Handler: &validatorForType[runtime.Object]{

pkg/webhook/alias.go

@@ -23,12 +23,6 @@ import (
 
 // define some aliases for common bits of the webhook functionality
 
-// CustomDefaulter defines functions for setting defaults on resources.
-type CustomDefaulter = admission.CustomDefaulter
-
-// CustomValidator defines functions for validating an operation.
-type CustomValidator = admission.CustomValidator
-
 // AdmissionRequest defines the input for an admission handler.
 // It contains information to identify the object in
 // question (group, version, kind, resource, subresource,