From 6bcfedb5118f83528fb7df0a4a20e644d4772fd1 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Mon, 23 Jul 2018 11:17:17 -0400
Subject: [PATCH] UPSTREAM: revert: <carry>: partial revert of 'rewrite
 unstructured objects on the CLI to avoid oapi'

---
 .../k8s.io/client-go/restmapper/discovery.go  |  7 --
 .../restmapper/patch_restmapper_kind.go       | 97 -------------------
 2 files changed, 104 deletions(-)
 delete mode 100644 vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/patch_restmapper_kind.go

diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/discovery.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/discovery.go
index 1db5f86711c9..aa158626af4f 100644
--- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/discovery.go
+++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/discovery.go
@@ -115,13 +115,6 @@ func NewDiscoveryRESTMapper(groupResources []*APIGroupResources) meta.RESTMapper
 				versionMapper.AddSpecific(gv.WithKind(resource.Kind), plural, singular, scope)
 				// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
 				versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
-
-				if isOAPIResource(plural) {
-					oapiGV := schema.GroupVersion{Version: "v1"}
-					versionMapper.AddSpecific(oapiGV.WithKind(resource.Kind), plural, singular, scope)
-					// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
-					versionMapper.Add(oapiGV.WithKind(resource.Kind+"List"), scope)
-				}
 			}
 			// TODO why is this type not in discovery (at least for "v1")
 			versionMapper.Add(gv.WithKind("List"), meta.RESTScopeRoot)
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/patch_restmapper_kind.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/patch_restmapper_kind.go
deleted file mode 100644
index d06996f9577f..000000000000
--- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/patch_restmapper_kind.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package restmapper
-
-import (
-	"strings"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-var oapiResources = map[string]bool{
-	"appliedclusterresourcequotas": true,
-	"appliedclusterresourcequota":  true,
-	"buildconfigs":                 true,
-	"buildconfig":                  true,
-	"bc":                           true,
-	"builds":                       true,
-	"build":                        true,
-	"clusternetworks":              true,
-	"clusternetwork":               true,
-	"clusterresourcequotas":        true,
-	"clusterresourcequota":         true,
-	"clusterquota":                 true,
-	"clusterrolebindings":          true,
-	"clusterrolebinding":           true,
-	"clusterroles":                 true,
-	"clusterrole":                  true,
-	"deploymentconfigrollbacks":    true,
-	"deploymentconfigrollback":     true,
-	"deploymentconfigs":            true,
-	"deploymentconfig":             true,
-	"dc":                           true,
-	"egressnetworkpolicies":     true,
-	"egressnetworkpolicy":       true,
-	"groups":                    true,
-	"group":                     true,
-	"hostsubnets":               true,
-	"hostsubnet":                true,
-	"identities":                true,
-	"identity":                  true,
-	"images":                    true,
-	"image":                     true,
-	"imagesignatures":           true,
-	"imagesignature":            true,
-	"imagestreamimages":         true,
-	"imagestreamimage":          true,
-	"isimage":                   true,
-	"imagestreamimports":        true,
-	"imagestreamimport":         true,
-	"imagestreammappings":       true,
-	"imagestreammapping":        true,
-	"imagestreams":              true,
-	"imagestream":               true,
-	"is":                        true,
-	"imagestreamtags":           true,
-	"imagestreamtag":            true,
-	"istag":                     true,
-	"netnamespaces":             true,
-	"netnamespace":              true,
-	"oauthaccesstokens":         true,
-	"oauthaccesstoken":          true,
-	"oauthauthorizetokens":      true,
-	"oauthauthorizetoken":       true,
-	"oauthclientauthorizations": true,
-	"oauthclientauthorization":  true,
-	"oauthclients":              true,
-	"oauthclient":               true,
-	"processedtemplates":        true,
-	"processedtemplate":         true,
-	"projects":                  true,
-	"project":                   true,
-	"rolebindingrestrictions":   true,
-	"rolebindingrestriction":    true,
-	"rolebindings":              true,
-	"rolebinding":               true,
-	"roles":                     true,
-	"role":                      true,
-	"routes":                    true,
-	"route":                     true,
-	"securitycontextconstraints": true,
-	"securitycontextconstraint":  true,
-	"scc": true,
-	"podsecuritypolicysubjectreviews":     true,
-	"podsecuritypolicysubjectreview":      true,
-	"podsecuritypolicyselfsubjectreviews": true,
-	"podsecuritypolicyselfsubjectreview":  true,
-	"podsecuritypolicyreviews":            true,
-	"podsecuritypolicyreview":             true,
-	"templates":                           true,
-	"template":                            true,
-	"useridentitymappings":                true,
-	"useridentitymapping":                 true,
-	"users":                               true,
-	"user":                                true,
-}
-
-func isOAPIResource(resource schema.GroupVersionResource) bool {
-	return oapiResources[strings.ToLower(resource.Resource)]
-}