From 0d65d340eae3dafef3094f3282fcbc4009e05d3b Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 25 Apr 2018 10:55:17 -0400 Subject: [PATCH] remove versioning interface Kubernetes-commit: e2fc5cf259463f896213afdef15d58ef9a91eb35 --- pkg/endpoints/apiserver_test.go | 27 --------------------------- pkg/server/genericapiserver_test.go | 9 +-------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go index 28aaa603d..159e184be 100644 --- a/pkg/endpoints/apiserver_test.go +++ b/pkg/endpoints/apiserver_test.go @@ -130,33 +130,6 @@ func init() { examplev1.AddToScheme(scheme) } -func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error) { - switch version { - case testGroupVersion: - return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - }, nil - case newGroupVersion: - return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - }, nil - case grouplessGroupVersion: - return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - }, nil - case testGroup2Version: - return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - }, nil - default: - return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, groupVersions) - } -} - -func newMapper() *meta.DefaultRESTMapper { - return meta.NewDefaultRESTMapper([]schema.GroupVersion{testGroupVersion, newGroupVersion}, interfacesFor) -} - func addGrouplessTypes() { scheme.AddKnownTypes(grouplessGroupVersion, &genericapitesting.Simple{}, &genericapitesting.SimpleList{}, &metav1.ListOptions{}, &metav1.ExportOptions{}, diff --git a/pkg/server/genericapiserver_test.go b/pkg/server/genericapiserver_test.go index 82046c952..a20d32660 100644 --- a/pkg/server/genericapiserver_test.go +++ b/pkg/server/genericapiserver_test.go @@ -153,20 +153,13 @@ func TestInstallAPIGroups(t *testing.T) { scheme.AddKnownTypes(v1GroupVersion, &metav1.Status{}) metav1.AddToGroupVersion(scheme, v1GroupVersion) - interfacesFor := func(version schema.GroupVersion) (*meta.VersionInterfaces, error) { - return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - }, nil - } - - mapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}, interfacesFor) + mapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}) for kind := range scheme.KnownTypes(gv) { mapper.Add(gv.WithKind(kind), meta.RESTScopeNamespace) } groupMeta := apimachinery.GroupMeta{ GroupVersions: []schema.GroupVersion{gv}, RESTMapper: mapper, - InterfacesFor: interfacesFor, } return APIGroupInfo{