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