github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 12:11:43 +00:00
Code Issues Projects Releases Wiki Activity

Client should not include ns/ for non-namespaced calls in v1beta3

Browse Source
This commit is contained in:
Clayton Coleman
2014-12-12 16:33:18 -05:00
parent 2495174ab7
commit 8f65442c2f
5 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/client/request.go
View File

@@ -103,6 +103,7 @@ type Request struct {
// structural elements of the request that are part of the Kubernetes API conventions
namespace string
namespaceSet bool
resource string
resourceName string
selector labels.Selector
@@ -190,10 +191,11 @@ func (r *Request) Namespace(namespace string) *Request {
if r.err != nil {
return r
}
if len(r.namespace) != 0 {
if r.namespaceSet {
r.err = fmt.Errorf("namespace already set to %q, cannot change to %q", r.namespace, namespace)
return r
}
r.namespaceSet = true
r.namespace = namespace
return r
}
@@ -330,7 +332,7 @@ func (r *Request) Poller(poller PollFunc) *Request {
func (r *Request) finalURL() string {
p := r.path
if !r.namespaceInQuery {
if r.namespaceSet && !r.namespaceInQuery && len(r.namespace) > 0 {
p = path.Join(p, "ns", r.namespace)
}
if len(r.resource) != 0 {
@@ -353,7 +355,7 @@ func (r *Request) finalURL() string {
query.Add(key, value)
}
if r.namespaceInQuery && len(r.namespace) > 0 {
if r.namespaceSet && r.namespaceInQuery && len(r.namespace) > 0 {
query.Add("namespace", r.namespace)
}