github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

fix admission controller

Browse Source
This commit is contained in:
Kevin Wiesmueller 2021-02-11 16:11:43 +01:00
parent 711f2dab47
commit 429a96da5e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission.go
View File

@ -33,7 +33,7 @@ const InvalidManagedFieldsAfterMutatingAdmissionWarningFormat = ".metadata.manag
// NewManagedFieldsValidatingAdmissionController validates the managedFields after calling // NewManagedFieldsValidatingAdmissionController validates the managedFields after calling
// the provided admission and resets them to their original state if they got changed to an invalid value // 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 { func NewManagedFieldsValidatingAdmissionController(wrap admission.Interface) admission.Interface {
return nil return &managedFieldsValidatingAdmissionController{wrap: wrap}
} }
type managedFieldsValidatingAdmissionController struct { type managedFieldsValidatingAdmissionController struct {
@ -64,10 +64,6 @@ func (admit *managedFieldsValidatingAdmissionController) Admit(ctx context.Conte
if err := mutationInterface.Admit(ctx, a, o); err != nil { if err := mutationInterface.Admit(ctx, a, o); err != nil {
return err return err
} }
objectMeta, err = meta.Accessor(a.GetObject())
if err != nil {
return err
}
managedFieldsAfterAdmission := objectMeta.GetManagedFields() managedFieldsAfterAdmission := objectMeta.GetManagedFields()
if err := validateManagedFields(managedFieldsAfterAdmission); err != nil { if err := validateManagedFields(managedFieldsAfterAdmission); err != nil {
objectMeta.SetManagedFields(managedFieldsBeforeAdmission) objectMeta.SetManagedFields(managedFieldsBeforeAdmission)