Add patch for openapi
parent
93323c622b
commit
7cc7452ee9
|
@ -37,5 +37,6 @@ 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
|
||||
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
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.
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue