diff --git a/cmd/webhook/app/webhook.go b/cmd/webhook/app/webhook.go index ef539ef48..bb6497399 100644 --- a/cmd/webhook/app/webhook.go +++ b/cmd/webhook/app/webhook.go @@ -35,7 +35,7 @@ import ( ) var validationHook handlers.ValidatingAdmissionHook = handlers.NewRegistryBackedValidator(logf.Log, webhook.Scheme, webhook.ValidationRegistry) -var mutationHook handlers.MutatingAdmissionHook = handlers.NewSchemeBackedMutator(logf.Log, webhook.Scheme, webhook.MutationRegistry) +var mutationHook handlers.MutatingAdmissionHook = handlers.NewRegistryBackedMutator(logf.Log, webhook.Scheme, webhook.MutationRegistry) var conversionHook handlers.ConversionHook = handlers.NewSchemeBackedConverter(logf.Log, webhook.Scheme) func NewServerWithOptions(log logr.Logger, opts options.WebhookOptions) (*server.Server, error) { diff --git a/pkg/webhook/handlers/mutation.go b/pkg/webhook/handlers/mutation.go index 4a629e371..281ceebc3 100644 --- a/pkg/webhook/handlers/mutation.go +++ b/pkg/webhook/handlers/mutation.go @@ -30,22 +30,22 @@ import ( logf "github.com/jetstack/cert-manager/pkg/logs" ) -type SchemeBackedMutator struct { +type RegistryBackedMutator struct { log logr.Logger decoder runtime.Decoder registry *mutation.Registry } -func NewSchemeBackedMutator(log logr.Logger, scheme *runtime.Scheme, registry *mutation.Registry) *SchemeBackedMutator { +func NewRegistryBackedMutator(log logr.Logger, scheme *runtime.Scheme, registry *mutation.Registry) *RegistryBackedMutator { factory := serializer.NewCodecFactory(scheme) - return &SchemeBackedMutator{ + return &RegistryBackedMutator{ log: log, decoder: factory.UniversalDecoder(), registry: registry, } } -func (c *SchemeBackedMutator) Mutate(admissionSpec *admissionv1.AdmissionRequest) *admissionv1.AdmissionResponse { +func (c *RegistryBackedMutator) Mutate(admissionSpec *admissionv1.AdmissionRequest) *admissionv1.AdmissionResponse { status := &admissionv1.AdmissionResponse{} status.UID = admissionSpec.UID diff --git a/pkg/webhook/handlers/mutation_test.go b/pkg/webhook/handlers/mutation_test.go index 39417d090..d8eba4fbf 100644 --- a/pkg/webhook/handlers/mutation_test.go +++ b/pkg/webhook/handlers/mutation_test.go @@ -52,7 +52,7 @@ func TestDefaultCertificate(t *testing.T) { install.Install(scheme) log := klogr.New() - c := NewSchemeBackedMutator(log, scheme, registry) + c := NewRegistryBackedMutator(log, scheme, registry) tests := map[string]admissionTestT{ "apply defaults to TestType": { inputRequest: admissionv1.AdmissionRequest{