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

fieldmanager: Strip managedfields BEFORE we update the timestamp

Browse Source
This commit is contained in:
Antoine Pelisse 2021-03-09 12:46:07 -08:00
parent 2bcbc527a7
commit c8be9651ce
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,8 @@ func NewDefaultCRDFieldManager(typeConverter TypeConverter, objectConverter runt
// newDefaultFieldManager is a helper function which wraps a Manager with certain default logic.
func newDefaultFieldManager(f Manager, typeConverter TypeConverter, objectConverter runtime.ObjectConvertor, objectCreater runtime.ObjectCreater, kind schema.GroupVersionKind, ignoreManagedFieldsFromRequestObject bool) *FieldManager {
f = NewStripMetaManager(f)
f = NewManagedFieldsUpdater(f)
f = NewStripMetaManager(f)
f = NewBuildManagerInfoManager(f, kind.GroupVersion())
f = NewCapManagersManager(f, DefaultMaxUpdateManagers)
f = NewProbabilisticSkipNonAppliedManager(f, objectCreater, kind, DefaultTrackOnCreateProbability)

1
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go
View File

@ -759,6 +759,7 @@ func TestNoOpChanges(t *testing.T) {
"labels": {
"a": "b"
},
"creationTimestamp": null,
}
}`), &obj.Object); err != nil {
t.Fatalf("error decoding YAML: %v", err)