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

Merge pull request #100032 from apelisse/strip-before-updating-timestamp

Browse Source 
fieldmanager: Strip managedfields BEFORE we update the timestamp
This commit is contained in:
Kubernetes Prow Robot 2021-04-08 17:10:47 -07:00 committed by GitHub
commit 53fac160e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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. // 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 { 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 = NewManagedFieldsUpdater(f)
f = NewStripMetaManager(f)
f = NewBuildManagerInfoManager(f, kind.GroupVersion()) f = NewBuildManagerInfoManager(f, kind.GroupVersion())
f = NewCapManagersManager(f, DefaultMaxUpdateManagers) f = NewCapManagersManager(f, DefaultMaxUpdateManagers)
f = NewProbabilisticSkipNonAppliedManager(f, objectCreater, kind, DefaultTrackOnCreateProbability) f = NewProbabilisticSkipNonAppliedManager(f, objectCreater, kind, DefaultTrackOnCreateProbability)

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

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