by codereview

Signed-off-by: dongjiang1989 <[email protected]>

Author: dongjiang1989

.golangci.yml

@@ -130,9 +130,6 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: .*The component config package has been deprecated and will be removed in a future release.'
-      - linters:
-          - staticcheck
-        text: 'SA1019: .* is deprecated: .* is deprecated, use .* instead '
       # With Go 1.16, the new embed directive can be used with an un-named import,
       # revive (previously, golint) only allows these to be imported in a main.go, which wouldn't work for us.
       # This directive allows the embed package to be imported with an underscore everywhere.

pkg/builder/webhook.go

@@ -39,10 +39,10 @@ import (
 // WebhookBuilder builds a Webhook.
 type WebhookBuilder[T runtime.Object] struct {
 	apiType                   runtime.Object
-	customDefaulter           admission.CustomDefaulter
+	customDefaulter           admission.CustomDefaulter //nolint:staticcheck
 	defaulter                 admission.Defaulter[T]
 	customDefaulterOpts       []admission.DefaulterOption
-	customValidator           admission.CustomValidator
+	customValidator           admission.CustomValidator //nolint:staticcheck
 	validator                 admission.Validator[T]
 	customPath                string
 	customValidatorCustomPath string
@@ -308,6 +308,7 @@ func (blder *WebhookBuilder[T]) getValidatingWebhook() (*admission.Webhook, erro
 		}
 		w = admission.WithValidator(blder.mgr.GetScheme(), blder.validator)
 	} else if blder.customValidator != nil {
+		//nolint:staticcheck
 		w = admission.WithCustomValidator(blder.mgr.GetScheme(), blder.apiType, blder.customValidator)
 	}
 	if w != nil && blder.recoverPanic != nil {

pkg/builder/webhook_test.go

@@ -1180,6 +1180,7 @@ func (*testDefaulter) Default(ctx context.Context, obj *TestDefaulterObject) err
 	return nil
 }
 
+//nolint:staticcheck
 var _ admission.CustomDefaulter = &TestCustomDefaulter{}
 
 type TestCustomValidator struct{}
@@ -1263,6 +1264,7 @@ func (*testValidator) ValidateDelete(ctx context.Context, obj *TestValidatorObje
 	return nil, nil
 }
 
+//nolint:staticcheck
 var _ admission.CustomValidator = &TestCustomValidator{}
 
 // TestCustomDefaultValidator for default
@@ -1286,6 +1288,7 @@ func (*TestCustomDefaultValidator) Default(ctx context.Context, obj runtime.Obje
 	return nil
 }
 
+//nolint:staticcheck
 var _ admission.CustomDefaulter = &TestCustomDefaulter{}
 
 // TestCustomDefaultValidator for validation
@@ -1345,6 +1348,7 @@ func (*TestCustomDefaultValidator) ValidateDelete(ctx context.Context, obj runti
 	return nil, nil
 }
 
+//nolint:staticcheck
 var _ admission.CustomValidator = &TestCustomValidator{}
 
 type testValidatorDefaulter struct{}

pkg/webhook/alias.go

@@ -26,12 +26,12 @@ import (
 // CustomDefaulter defines functions for setting defaults on resources.
 //
 // Deprecated: Use admission.Defaulter instead.
-type CustomDefaulter = admission.CustomDefaulter
+type CustomDefaulter = admission.CustomDefaulter //nolint:staticcheck
 
 // CustomValidator defines functions for validating an operation.
 //
 // Deprecated: Use admission.Validator instead.
-type CustomValidator = admission.CustomValidator
+type CustomValidator = admission.CustomValidator //nolint:staticcheck
 
 // AdmissionRequest defines the input for an admission handler.
 // It contains information to identify the object in