From c8be9651ce0de1eee3fa785882fe01dee4b15d37 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Tue, 9 Mar 2021 12:46:07 -0800 Subject: [PATCH] fieldmanager: Strip managedfields BEFORE we update the timestamp --- .../pkg/endpoints/handlers/fieldmanager/fieldmanager.go | 2 +- .../pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go index 71a4eff8e80..28b6b147d04 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go @@ -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) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go index d249e5f29a2..61a06cf0d73 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go @@ -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)