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

fieldmanager: remove dependencies on dummy version conversion for tests

Browse Source
This commit is contained in:
Antoine Pelisse 2022-11-30 12:53:18 -08:00
parent 7217e0308d
commit 530d25026e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,16 @@ type fakeObjectDefaulter struct{}
func (d *fakeObjectDefaulter) Default(in runtime.Object) {} func (d *fakeObjectDefaulter) Default(in runtime.Object) {}
type sameVersionConverter struct{}
func (sameVersionConverter) Convert(object *typed.TypedValue, version fieldpath.APIVersion) (*typed.TypedValue, error) {
return object, nil
}
func (sameVersionConverter) IsMissingVersionError(error) bool {
return false
}
type TestFieldManager struct { type TestFieldManager struct {
fieldManager *FieldManager fieldManager *FieldManager
apiVersion string apiVersion string
@ -91,9 +101,8 @@ func NewDefaultTestFieldManager(gvk schema.GroupVersionKind) TestFieldManager {
func NewTestFieldManager(gvk schema.GroupVersionKind, subresource string, chainFieldManager func(Manager) Manager) TestFieldManager { func NewTestFieldManager(gvk schema.GroupVersionKind, subresource string, chainFieldManager func(Manager) Manager) TestFieldManager {
m := NewFakeOpenAPIModels() m := NewFakeOpenAPIModels()
typeConverter := NewFakeTypeConverter(m) typeConverter := NewFakeTypeConverter(m)
converter := newVersionConverter(typeConverter, &fakeObjectConvertor{}, gvk.GroupVersion())
apiVersion := fieldpath.APIVersion(gvk.GroupVersion().String()) apiVersion := fieldpath.APIVersion(gvk.GroupVersion().String())
objectConverter := &fakeObjectConvertor{converter, apiVersion} objectConverter := &fakeObjectConvertor{sameVersionConverter{}, apiVersion}
f, err := NewStructuredMergeManager( f, err := NewStructuredMergeManager(
typeConverter, typeConverter,
objectConverter, objectConverter,