mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #100032 from apelisse/strip-before-updating-timestamp
fieldmanager: Strip managedfields BEFORE we update the timestamp
This commit is contained in:
commit
53fac160e5
@ -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)
|
||||
|
@ -770,6 +770,7 @@ func TestNoOpChanges(t *testing.T) {
|
||||
"labels": {
|
||||
"a": "b"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
}
|
||||
}`), &obj.Object); err != nil {
|
||||
t.Fatalf("error decoding YAML: %v", err)
|
||||
|
Loading…
Reference in New Issue
Block a user