github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Chain the field manager creation calls in newDefaultFieldManager and test

Browse Source
This commit is contained in:
Kevin Delgado 2021-04-13 16:15:25 +00:00
parent 46563b0abe
commit d37461180a
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,15 +99,20 @@ 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 = NewManagedFieldsUpdater(f) return NewFieldManager(
f = NewStripMetaManager(f) NewLastAppliedUpdater(
f = NewBuildManagerInfoManager(f, kind.GroupVersion()) NewLastAppliedManager(
f = NewCapManagersManager(f, DefaultMaxUpdateManagers) NewProbabilisticSkipNonAppliedManager(
f = NewProbabilisticSkipNonAppliedManager(f, objectCreater, kind, DefaultTrackOnCreateProbability) NewCapManagersManager(
f = NewLastAppliedManager(f, typeConverter, objectConverter, kind.GroupVersion()) NewBuildManagerInfoManager(
f = NewLastAppliedUpdater(f) NewManagedFieldsUpdater(
NewStripMetaManager(f),
return NewFieldManager(f, ignoreManagedFieldsFromRequestObject) ), kind.GroupVersion(),
), DefaultMaxUpdateManagers,
), objectCreater, kind, DefaultTrackOnCreateProbability,
), typeConverter, objectConverter, kind.GroupVersion()),
), ignoreManagedFieldsFromRequestObject,
)
} }
// DecodeManagedFields converts ManagedFields from the wire format (api format) // DecodeManagedFields converts ManagedFields from the wire format (api format)

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

@ -112,12 +112,17 @@ func NewTestFieldManager(gvk schema.GroupVersionKind, ignoreManagedFieldsFromReq
live := &unstructured.Unstructured{} live := &unstructured.Unstructured{}
live.SetKind(gvk.Kind) live.SetKind(gvk.Kind)
live.SetAPIVersion(gvk.GroupVersion().String()) live.SetAPIVersion(gvk.GroupVersion().String())
f = NewStripMetaManager(f) f = NewLastAppliedUpdater(
f = NewManagedFieldsUpdater(f) NewLastAppliedManager(
f = NewBuildManagerInfoManager(f, gvk.GroupVersion()) NewProbabilisticSkipNonAppliedManager(
f = NewProbabilisticSkipNonAppliedManager(f, &fakeObjectCreater{gvk: gvk}, gvk, DefaultTrackOnCreateProbability) NewBuildManagerInfoManager(
f = NewLastAppliedManager(f, typeConverter, objectConverter, gvk.GroupVersion()) NewManagedFieldsUpdater(
f = NewLastAppliedUpdater(f) NewStripMetaManager(f),
), gvk.GroupVersion(),
), &fakeObjectCreater{gvk: gvk}, gvk, DefaultTrackOnCreateProbability,
), typeConverter, objectConverter, gvk.GroupVersion(),
),
)
if chainFieldManager != nil { if chainFieldManager != nil {
f = chainFieldManager(f) f = chainFieldManager(f)
} }