fix k8s config user both 'token' and 'client-certificate' (#44)

hjacobs · Oct 2, 2019 · a569478 · a569478
1 parent 40b1eb4
commit a569478
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pykube/http.py b/pykube/http.py
@@ -125,13 +125,14 @@ def send(self, request, **kwargs):
                 # @@@ support token refresh
                 if "id-token" in auth_config:
                     request.headers["Authorization"] = "Bearer {}".format(auth_config["id-token"])
-        elif "client-certificate" in config.user:
+        elif config.user.get("username") and config.user.get("password"):
+            request.prepare_auth((config.user["username"], config.user["password"]))
+
+        if "client-certificate" in config.user:
             kwargs["cert"] = (
                 config.user["client-certificate"].filename(),
                 config.user["client-key"].filename(),
             )
-        elif config.user.get("username") and config.user.get("password"):
-            request.prepare_auth((config.user["username"], config.user["password"]))
 
         # setup certificate verification