Merge master into release branch for 1.0.0a4

Author: mbohlool

CHANGELOG.md

@@ -1,4 +1,8 @@
-# v1.0.0-alpha.3
+# v1.0.0a4
+
+- Bugfix: Fixed broken config loader #77
+
+# v1.0.0a3
 
 - Add context switch to kube config loader #46 
 - Add default kube config location #64

kubernetes/config/kube_config.py

@@ -79,7 +79,7 @@ def as_file(self):
         if use_data_if_no_file:
             self._file = _create_temp_file_with_content(
                 base64.decodestring(self._data.encode()))
-        if not os.path.isfile(self._file):
+        if self._file and not os.path.isfile(self._file):
             raise ConfigException("File does not exists: %s" % self._file)
         return self._file
 
@@ -157,15 +157,15 @@ def _load_gcp_token(self):
         # Ignore configs in auth-provider and rely on GoogleCredentials
         # caching and refresh mechanism.
         # TODO: support gcp command based token ("cmd-path" config).
-        self.token = self._get_google_credentials()
+        self.token = "Bearer %s" % self._get_google_credentials()
         return self.token
 
     def _load_user_token(self):
         token = FileOrData(
             self._user, 'tokenFile', 'token',
             file_base_path=self._config_base_path).as_data()
         if token:
-            self.token = token
+            self.token = "Bearer %s" % token
             return True
 
     def _load_user_pass_token(self):

kubernetes/config/kube_config_test.py

@@ -26,6 +26,8 @@
                           load_kube_config, list_kube_config_contexts,
                           new_client_from_config)
 
+BEARER_TOKEN_FORMAT = "Bearer %s"
+
 NON_EXISTING_FILE = "zz_non_existing_file_472398324"
 
 
@@ -407,7 +409,8 @@ def test_no_user_context(self):
         self.assertEqual(expected, actual)
 
     def test_simple_token(self):
-        expected = FakeConfig(host=TEST_HOST, token=TEST_DATA_BASE64)
+        expected = FakeConfig(host=TEST_HOST,
+                              token=BEARER_TOKEN_FORMAT % TEST_DATA_BASE64)
         actual = FakeConfig()
         KubeConfigLoader(
             config_dict=self.TEST_KUBE_CONFIG,
@@ -420,10 +423,12 @@ def test_load_user_token(self):
             config_dict=self.TEST_KUBE_CONFIG,
             active_context="simple_token")
         self.assertTrue(loader._load_user_token())
-        self.assertEqual(TEST_DATA_BASE64, loader.token)
+        self.assertEqual(BEARER_TOKEN_FORMAT % TEST_DATA_BASE64, loader.token)
 
     def test_gcp(self):
-        expected = FakeConfig(host=TEST_HOST, token=TEST_ANOTHER_DATA_BASE64)
+        expected = FakeConfig(
+            host=TEST_HOST,
+            token=BEARER_TOKEN_FORMAT % TEST_ANOTHER_DATA_BASE64)
         actual = FakeConfig()
         KubeConfigLoader(
             config_dict=self.TEST_KUBE_CONFIG,
@@ -439,7 +444,8 @@ def test_load_gcp_token(self):
             active_context="gcp",
             get_google_credentials=lambda: TEST_ANOTHER_DATA_BASE64)
         self.assertTrue(loader._load_gcp_token())
-        self.assertEqual(TEST_ANOTHER_DATA_BASE64, loader.token)
+        self.assertEqual(BEARER_TOKEN_FORMAT % TEST_ANOTHER_DATA_BASE64,
+                         loader.token)
 
     def test_user_pass(self):
         expected = FakeConfig(host=TEST_HOST, token=TEST_BASIC_TOKEN)
@@ -458,13 +464,6 @@ def test_load_user_pass_token(self):
         self.assertEqual(TEST_BASIC_TOKEN, loader.token)
 
     def test_ssl_no_cert_files(self):
-        expected = FakeConfig(
-            host=TEST_SSL_HOST,
-            token=TEST_DATA_BASE64,
-            cert_file=TEST_CLIENT_CERT,
-            key_file=TEST_CLIENT_KEY,
-            ssl_ca_cert=TEST_CERTIFICATE_AUTH
-        )
         actual = FakeConfig()
         loader = KubeConfigLoader(
             config_dict=self.TEST_KUBE_CONFIG,
@@ -475,7 +474,7 @@ def test_ssl_no_cert_files(self):
     def test_ssl(self):
         expected = FakeConfig(
             host=TEST_SSL_HOST,
-            token=TEST_DATA_BASE64,
+            token=BEARER_TOKEN_FORMAT % TEST_DATA_BASE64,
             cert_file=self._create_temp_file(TEST_CLIENT_CERT),
             key_file=self._create_temp_file(TEST_CLIENT_KEY),
             ssl_ca_cert=self._create_temp_file(TEST_CERTIFICATE_AUTH)
@@ -513,7 +512,7 @@ def test_set_active_context(self):
     def test_ssl_with_relative_ssl_files(self):
         expected = FakeConfig(
             host=TEST_SSL_HOST,
-            token=TEST_DATA_BASE64,
+            token=BEARER_TOKEN_FORMAT % TEST_DATA_BASE64,
             cert_file=self._create_temp_file(TEST_CLIENT_CERT),
             key_file=self._create_temp_file(TEST_CLIENT_KEY),
             ssl_ca_cert=self._create_temp_file(TEST_CERTIFICATE_AUTH)
@@ -539,7 +538,8 @@ def test_ssl_with_relative_ssl_files(self):
             shutil.rmtree(temp_dir)
 
     def test_load_kube_config(self):
-        expected = FakeConfig(host=TEST_HOST, token=TEST_DATA_BASE64)
+        expected = FakeConfig(host=TEST_HOST,
+                              token=BEARER_TOKEN_FORMAT % TEST_DATA_BASE64)
         config_file = self._create_temp_file(yaml.dump(self.TEST_KUBE_CONFIG))
         actual = FakeConfig()
         load_kube_config(config_file=config_file,context="simple_token",
@@ -564,7 +564,7 @@ def test_new_client_from_config(self):
         client = new_client_from_config(
             config_file=config_file, context="simple_token")
         self.assertEqual(TEST_HOST, client.config.host)
-        self.assertEqual(TEST_DATA_BASE64,
+        self.assertEqual(BEARER_TOKEN_FORMAT % TEST_DATA_BASE64,
                          client.config.api_key['authorization'])
 
 

setup.py

@@ -47,6 +47,6 @@
               'kubernetes.client.models', 'scripts'],
     include_package_data=True,
     long_description="""\
-    Python client for talk to a kubernetes cluster.
+    Python client for kubernetes http://kubernetes.io/
     """
 )