Skip to content

WIP ignore managed fields from wrong API group on object create #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
iakmc wants to merge 1 commit into
base: kcp-1.34.2
Choose a base branch
from
Draft

WIP ignore managed fields from wrong API group on object create #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions staging/src/k8s.io/apimachinery/pkg/util/managedfields/internal/fieldmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,24 @@ func decodeLiveOrNew(liveObj, newObj runtime.Object, ignoreManagedFieldsFromRequ
if err != nil || len(managed.Fields()) == 0 {
return emptyManagedFieldsOnErr(DecodeManagedFields(liveAccessor.GetManagedFields()))
}

// Drop managed field entries whose API group doesn't match the object's
// own group. This can happen when an object is created from a template
// derived from a different resource type and accidentally carries over
// that type's managedFields (e.g. a BoundSchema template built from a CRD
// carrying apiextensions.k8s.io/v1 entries).
if objGroup := newObj.GetObjectKind().GroupVersionKind().Group; objGroup != "" {
for manager, entry := range managed.Fields() {
entryGV, err := schema.ParseGroupVersion(string(entry.APIVersion()))
if err != nil || entryGV.Group != objGroup {
delete(managed.Fields(), manager)
}
}
if len(managed.Fields()) == 0 {
return emptyManagedFieldsOnErr(DecodeManagedFields(liveAccessor.GetManagedFields()))
}
}

return managed, nil
}

Expand Down