github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101611 from p0lyn0mial/fix-fieldmanager-admission-metadata

Browse Source 
let objects without metadata pass through the managedFields admission controller
This commit is contained in:
Kubernetes Prow Robot 2021-04-29 06:50:50 -07:00 committed by GitHub
commit db2c109a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,10 @@ func (admit *managedFieldsValidatingAdmissionController) Admit(ctx context.Conte
} }
objectMeta, err := meta.Accessor(a.GetObject()) objectMeta, err := meta.Accessor(a.GetObject())
if err != nil { if err != nil {
return err // the object we are dealing with doesn't have object metadata defined
// in that case we don't have to keep track of the managedField
// just call the wrapped admission
return mutationInterface.Admit(ctx, a, o)
} }
managedFieldsBeforeAdmission := objectMeta.GetManagedFields() managedFieldsBeforeAdmission := objectMeta.GetManagedFields()
if err := mutationInterface.Admit(ctx, a, o); err != nil { if err := mutationInterface.Admit(ctx, a, o); err != nil {