From 94e5548cedfd2c1301edd226211e2211b0ed342a Mon Sep 17 00:00:00 2001
From: dlorenc <dlorenc@google.com>
Date: Mon, 11 Dec 2017 09:49:24 -0800
Subject: [PATCH] Remove openapi patch.

This is now upstream.
---
 hack/godeps/godep-save.sh |  1 -
 hack/openapi.diff         | 31 -------------------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 hack/openapi.diff

diff --git a/hack/godeps/godep-save.sh b/hack/godeps/godep-save.sh
index ed9692d05..2a873ff55 100755
--- a/hack/godeps/godep-save.sh
+++ b/hack/godeps/godep-save.sh
@@ -37,6 +37,5 @@ git checkout -- ${MINIKUBE_ROOT}/vendor/golang.org/x/sys/windows
 pushd ${MINIKUBE_ROOT} >/dev/null
     git apply ${MINIKUBE_ROOT}/hack/tpr-patch.diff
     git apply ${MINIKUBE_ROOT}/hack/kube-proxy-patch.diff
-    git apply ${MINIKUBE_ROOT}/hack/openapi.diff
 popd >/dev/null
 
diff --git a/hack/openapi.diff b/hack/openapi.diff
deleted file mode 100644
index a02b43f66..000000000
--- a/hack/openapi.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/vendor/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go b/vendor/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go
-index 182c51796..03725947c 100644
---- a/vendor/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go
-+++ b/vendor/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go
-@@ -26,11 +26,12 @@ import (
- 	"github.com/emicklei/go-restful"
- 	"github.com/go-openapi/spec"
- 
-+	"sort"
-+
- 	"k8s.io/apimachinery/pkg/apis/meta/v1"
- 	"k8s.io/apimachinery/pkg/runtime"
- 	"k8s.io/apimachinery/pkg/runtime/schema"
- 	"k8s.io/apiserver/pkg/util/trie"
--	"sort"
- )
- 
- var verbs = trie.New([]string{"get", "log", "read", "replace", "patch", "delete", "deletecollection", "watch", "connect", "proxy", "list", "create", "patch"})
-@@ -135,7 +136,11 @@ func friendlyName(name string) string {
- }
- 
- func typeName(t reflect.Type) string {
--	return fmt.Sprintf("%s.%s", t.PkgPath(), t.Name())
-+	path := t.PkgPath()
-+	if strings.Contains(path, "/vendor/") {
-+		path = path[strings.Index(path, "/vendor/")+len("/vendor/"):]
-+	}
-+	return fmt.Sprintf("%s.%s", path, t.Name())
- }
- 
- // NewDefinitionNamer constructs a new DefinitionNamer to be used to customize OpenAPI spec.
-- 
GitLab