added non-namespace URL support

kelproject · Nov 17, 2015 · 00552ba · 00552ba
1 parent 77a2505
commit 00552ba
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/pykube/http.py b/pykube/http.py
@@ -1,3 +1,5 @@
+import posixpath
+
 import requests
 
 
@@ -23,12 +25,20 @@ def build_session(self):
         return s
 
     def get_kwargs(self, **kwargs):
-        kwargs["url"] = "{}/api/{}/namespaces/{}{}".format(
-            self.url,
+        bits = [
+            "/api",
             self.version,
-            kwargs.pop("namespace", "default"),
-            kwargs.get("url", "")
-        )
+        ]
+        if "namespace" in kwargs:
+            bits.extend([
+                "namespaces",
+                kwargs.pop("namespace"),
+            ])
+        url = kwargs.get("url", "")
+        if url.startswith("/"):
+            url = url[1:]
+        bits.append(url)
+        kwargs["url"] = self.url + posixpath.join(*bits)
         return kwargs
 
     def request(self, *args, **kwargs):