From c7268965497522c59b8661b7cb926ba9bf07197b Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Mon, 23 Apr 2018 10:23:01 -0400
Subject: [PATCH] remove confusing flexibility for metadata interpretation

Kubernetes-commit: 0710f72c65ad23e7a3726b345898ef4aaaac26fa
---
 dynamic/dynamic_util.go      |  9 ---------
 dynamic/dynamic_util_test.go | 12 +++++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dynamic/dynamic_util.go b/dynamic/dynamic_util.go
index c2cf0dae..782c7047 100644
--- a/dynamic/dynamic_util.go
+++ b/dynamic/dynamic_util.go
@@ -26,15 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-// 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{},
-		MetadataAccessor: meta.NewAccessor(),
-	}, nil
-}
-
 // NewDiscoveryRESTMapper returns a RESTMapper based on discovery information.
 func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) {
 	rm := meta.NewDefaultRESTMapper(nil, versionFunc)
diff --git a/dynamic/dynamic_util_test.go b/dynamic/dynamic_util_test.go
index cdc68e01..82a2dd8b 100644
--- a/dynamic/dynamic_util_test.go
+++ b/dynamic/dynamic_util_test.go
@@ -19,7 +19,9 @@ 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"
 )
 
@@ -43,7 +45,7 @@ func TestDiscoveryRESTMapper(t *testing.T) {
 		Kind:    "test_kind",
 	}
 
-	mapper, err := NewDiscoveryRESTMapper(resources, VersionInterfaces)
+	mapper, err := NewDiscoveryRESTMapper(resources, versionInterfaces)
 	if err != nil {
 		t.Fatalf("unexpected error creating mapper: %s", err)
 	}
@@ -77,3 +79,11 @@ 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
+}