From dd6d4548488acaab77c99c5efe01de16d287ca0c Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Sat, 21 Jan 2017 15:48:41 -0500
Subject: [PATCH] kubectl: remove ThirdPartyResourceData behavior for
 unregistered objects

---
 pkg/kubectl/cmd/util/factory.go                | 16 ----------------
 pkg/kubectl/cmd/util/factory_client_access.go  |  3 +--
 pkg/kubectl/cmd/util/factory_object_mapping.go |  4 ----
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go
index 8411f2eacde..6e213a2038b 100644
--- a/pkg/kubectl/cmd/util/factory.go
+++ b/pkg/kubectl/cmd/util/factory.go
@@ -51,7 +51,6 @@ import (
 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
 	"k8s.io/kubernetes/pkg/kubectl"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
-	"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
 )
 
 const (
@@ -241,21 +240,6 @@ func getGroupVersionKinds(gvks []schema.GroupVersionKind, group string) []schema
 	return result
 }
 
-func makeInterfacesFor(versionList []schema.GroupVersion) func(version schema.GroupVersion) (*meta.VersionInterfaces, error) {
-	accessor := meta.NewAccessor()
-	return func(version schema.GroupVersion) (*meta.VersionInterfaces, error) {
-		for ix := range versionList {
-			if versionList[ix].String() == version.String() {
-				return &meta.VersionInterfaces{
-					ObjectConvertor:  thirdpartyresourcedata.NewThirdPartyObjectConverter(api.Scheme),
-					MetadataAccessor: accessor,
-				}, nil
-			}
-		}
-		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, versionList)
-	}
-}
-
 type factory struct {
 	ClientAccessFactory
 	ObjectMappingFactory
diff --git a/pkg/kubectl/cmd/util/factory_client_access.go b/pkg/kubectl/cmd/util/factory_client_access.go
index 93185177f57..3dd42c458e4 100644
--- a/pkg/kubectl/cmd/util/factory_client_access.go
+++ b/pkg/kubectl/cmd/util/factory_client_access.go
@@ -49,7 +49,6 @@ import (
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
-	"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
 )
 
 type ring0Factory struct {
@@ -209,7 +208,7 @@ func (f *ring0Factory) Decoder(toInternal bool) runtime.Decoder {
 	} else {
 		decoder = api.Codecs.UniversalDeserializer()
 	}
-	return thirdpartyresourcedata.NewDecoder(decoder, "")
+	return decoder
 }
 
 func (f *ring0Factory) JSONEncoder() runtime.Encoder {
diff --git a/pkg/kubectl/cmd/util/factory_object_mapping.go b/pkg/kubectl/cmd/util/factory_object_mapping.go
index a9fe71b52ac..abf162f6683 100644
--- a/pkg/kubectl/cmd/util/factory_object_mapping.go
+++ b/pkg/kubectl/cmd/util/factory_object_mapping.go
@@ -47,7 +47,6 @@ import (
 	"k8s.io/kubernetes/pkg/controller"
 	"k8s.io/kubernetes/pkg/kubectl"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
-	"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
 )
 
 type ring1Factory struct {
@@ -127,9 +126,6 @@ func (f *ring1Factory) ClientForMapping(mapping *meta.RESTMapping) (resource.RES
 	}
 	gv := gvk.GroupVersion()
 	cfg.GroupVersion = &gv
-	if api.Registry.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) {
-		cfg.NegotiatedSerializer = thirdpartyresourcedata.NewNegotiatedSerializer(api.Codecs, gvk.Kind, gv, gv)
-	}
 	return restclient.RESTClientFor(cfg)
 }