From 827c5e021d37202dbf30b0358cc77a9517c31819 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Wed, 18 Jan 2017 09:04:15 +0100 Subject: [PATCH] fix rootScopeNaming generate selfLink issue #37686 --- src/k8s.io/kubernetes/pkg/apiserver/api_installer.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go b/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go index eaf6e23..c3144c4 100644 --- a/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go +++ b/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go @@ -799,7 +799,10 @@ func (n rootScopeNaming) GenerateLink(req *restful.Request, obj runtime.Object) return "", err } } - return n.pathPrefix + url.QueryEscape(name) + n.pathSuffix, nil + if len(n.pathSuffix) == 0 { + return gpath.Join(n.pathPrefix, url.QueryEscape(name)), nil + } + return gpath.Join(n.pathPrefix, url.QueryEscape(name), n.pathSuffix), nil } // GenerateListLink returns the appropriate path and query to locate a list by its canonical path. -- 2.7.4