From 429a96da5e856c435b08b50791d462120724c475 Mon Sep 17 00:00:00 2001 From: Kevin Wiesmueller Date: Thu, 11 Feb 2021 16:11:43 +0100 Subject: [PATCH] fix admission controller --- .../pkg/endpoints/handlers/fieldmanager/admission.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission.go index 10c172adf58..d489fda6502 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission.go @@ -33,7 +33,7 @@ const InvalidManagedFieldsAfterMutatingAdmissionWarningFormat = ".metadata.manag // NewManagedFieldsValidatingAdmissionController validates the managedFields after calling // the provided admission and resets them to their original state if they got changed to an invalid value func NewManagedFieldsValidatingAdmissionController(wrap admission.Interface) admission.Interface { - return nil + return &managedFieldsValidatingAdmissionController{wrap: wrap} } type managedFieldsValidatingAdmissionController struct { @@ -64,10 +64,6 @@ func (admit *managedFieldsValidatingAdmissionController) Admit(ctx context.Conte if err := mutationInterface.Admit(ctx, a, o); err != nil { return err } - objectMeta, err = meta.Accessor(a.GetObject()) - if err != nil { - return err - } managedFieldsAfterAdmission := objectMeta.GetManagedFields() if err := validateManagedFields(managedFieldsAfterAdmission); err != nil { objectMeta.SetManagedFields(managedFieldsBeforeAdmission)