From 7205c0679a53e097c0655b727af669eed5ca87a3 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 --- discovery/restmapper.go | 18 ++++++++---------- discovery/restmapper_test.go | 4 ++-- dynamic/dynamic_util.go | 4 ++-- dynamic/dynamic_util_test.go | 12 +----------- scale/client_test.go | 3 +-- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/discovery/restmapper.go b/discovery/restmapper.go index f90e1bb0..17ddc6c5 100644 --- a/discovery/restmapper.go +++ b/discovery/restmapper.go @@ -39,7 +39,7 @@ type APIGroupResources struct { // NewRESTMapper returns a PriorityRESTMapper based on the discovered // groups and resources passed in. -func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.VersionInterfacesFunc) meta.RESTMapper { +func NewRESTMapper(groupResources []*APIGroupResources) meta.RESTMapper { unionMapper := meta.MultiRESTMapper{} var groupPriority []string @@ -90,7 +90,7 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V } gv := schema.GroupVersion{Group: group.Group.Name, Version: discoveryVersion.Version} - versionMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}, versionInterfaces) + versionMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}) for _, resource := range resources { scope := meta.RESTScopeNamespace @@ -175,19 +175,17 @@ func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) { // initialization of the RESTMapper until the first mapping is // requested. type DeferredDiscoveryRESTMapper struct { - initMu sync.Mutex - delegate meta.RESTMapper - cl CachedDiscoveryInterface - versionInterface meta.VersionInterfacesFunc + initMu sync.Mutex + delegate meta.RESTMapper + cl CachedDiscoveryInterface } // NewDeferredDiscoveryRESTMapper returns a // DeferredDiscoveryRESTMapper that will lazily query the provided // client for discovery information to do REST mappings. -func NewDeferredDiscoveryRESTMapper(cl CachedDiscoveryInterface, versionInterface meta.VersionInterfacesFunc) *DeferredDiscoveryRESTMapper { +func NewDeferredDiscoveryRESTMapper(cl CachedDiscoveryInterface) *DeferredDiscoveryRESTMapper { return &DeferredDiscoveryRESTMapper{ - cl: cl, - versionInterface: versionInterface, + cl: cl, } } @@ -204,7 +202,7 @@ func (d *DeferredDiscoveryRESTMapper) getDelegate() (meta.RESTMapper, error) { return nil, err } - d.delegate = NewRESTMapper(groupResources, d.versionInterface) + d.delegate = NewRESTMapper(groupResources) return d.delegate, err } diff --git a/discovery/restmapper_test.go b/discovery/restmapper_test.go index 69ee7e68..4489bdb5 100644 --- a/discovery/restmapper_test.go +++ b/discovery/restmapper_test.go @@ -94,7 +94,7 @@ func TestRESTMapper(t *testing.T) { }, } - restMapper := NewRESTMapper(resources, nil) + restMapper := NewRESTMapper(resources) kindTCs := []struct { input schema.GroupVersionResource @@ -243,7 +243,7 @@ func TestDeferredDiscoveryRESTMapper_CacheMiss(t *testing.T) { assert := assert.New(t) cdc := fakeCachedDiscoveryInterface{fresh: false} - m := NewDeferredDiscoveryRESTMapper(&cdc, nil) + m := NewDeferredDiscoveryRESTMapper(&cdc) assert.False(cdc.fresh, "should NOT be fresh after instantiation") assert.Zero(cdc.invalidateCalls, "should not have called Invalidate()") diff --git a/dynamic/dynamic_util.go b/dynamic/dynamic_util.go index 782c7047..570f9f17 100644 --- a/dynamic/dynamic_util.go +++ b/dynamic/dynamic_util.go @@ -27,8 +27,8 @@ import ( ) // NewDiscoveryRESTMapper returns a RESTMapper based on discovery information. -func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) { - rm := meta.NewDefaultRESTMapper(nil, versionFunc) +func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList) (*meta.DefaultRESTMapper, error) { + rm := meta.NewDefaultRESTMapper(nil) for _, resourceList := range resources { gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) if err != nil { diff --git a/dynamic/dynamic_util_test.go b/dynamic/dynamic_util_test.go index 82a2dd8b..37113d4a 100644 --- a/dynamic/dynamic_util_test.go +++ b/dynamic/dynamic_util_test.go @@ -19,9 +19,7 @@ package dynamic import ( "testing" - "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -45,7 +43,7 @@ func TestDiscoveryRESTMapper(t *testing.T) { Kind: "test_kind", } - mapper, err := NewDiscoveryRESTMapper(resources, versionInterfaces) + mapper, err := NewDiscoveryRESTMapper(resources) if err != nil { t.Fatalf("unexpected error creating mapper: %s", err) } @@ -79,11 +77,3 @@ func TestDiscoveryRESTMapper(t *testing.T) { } } } - -// VersionInterfaces provides an object converter and metadata -// accessor appropriate for use with unstructured objects. -func versionInterfaces(schema.GroupVersion) (*meta.VersionInterfaces, error) { - return &meta.VersionInterfaces{ - ObjectConvertor: &unstructured.UnstructuredObjectConverter{}, - }, nil -} diff --git a/scale/client_test.go b/scale/client_test.go index 6301320f..d7699453 100644 --- a/scale/client_test.go +++ b/scale/client_test.go @@ -40,7 +40,6 @@ import ( autoscalingv1 "k8s.io/api/autoscaling/v1" corev1 "k8s.io/api/core/v1" extv1beta1 "k8s.io/api/extensions/v1beta1" - apimeta "k8s.io/apimachinery/pkg/api/meta" coretesting "k8s.io/client-go/testing" ) @@ -101,7 +100,7 @@ func fakeScaleClient(t *testing.T) (ScalesGetter, []schema.GroupResource) { if err != nil { t.Fatalf("unexpected error while constructing resource list from fake discovery client: %v", err) } - restMapper := discovery.NewRESTMapper(restMapperRes, apimeta.InterfacesForUnstructured) + restMapper := discovery.NewRESTMapper(restMapperRes) autoscalingScale := &autoscalingv1.Scale{ TypeMeta: metav1.TypeMeta{