Merge pull request #2607 from yliaog/automated-release-of-36.0.2-upstream-release-36.0-1780086981

k8s-ci-robot · web-flow · commit 1f2df0359a6f · 2026-06-01T23:38:52.000+05:30
Automated release of 36.0.2 upstream release 36.0 1780086981
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v36.0.2
+
+Kubernetes API Version: v1.36.1
+
+### Uncategorized
+- Restored backward compatibility for `Configuration.auth_settings()`:
+  the legacy `api_key['authorization']` lookup is honored as a fallback
+  when `api_key['BearerToken']` is not set, fixing 401 Unauthorized
+  regressions seen after upgrading to v36.0.0 (#2595). (#2604, @GK-07)
+
 # v36.0.1
 
 Kubernetes API Version: v1.36.1
diff --git a/kubernetes/README.md b/kubernetes/README.md
@@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: release-1.36
-- Package version: 36.0.1
+- Package version: 36.0.2
 - Build package: org.openapitools.codegen.languages.PythonLegacyClientCodegen
 
 ## Requirements.
diff --git a/kubernetes/__init__.py b/kubernetes/__init__.py
@@ -14,7 +14,7 @@
 
 __project__ = 'kubernetes'
 # The version is auto-updated. Please do not edit.
-__version__ = "36.0.1"
+__version__ = "36.0.2"
 
 from . import client
 from . import config
diff --git a/kubernetes/aio/README.md b/kubernetes/aio/README.md
@@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: release-1.36
-- Package version: 36.0.1
+- Package version: 36.0.2
 - Build package: org.openapitools.codegen.languages.PythonLegacyClientCodegen
 
 ## Requirements.
diff --git a/kubernetes/aio/__init__.py b/kubernetes/aio/__init__.py
@@ -14,7 +14,7 @@
 
 __project__ = "kubernetes_aio"
 # The version is auto-updated. Please do not edit.
-__version__ = "36.0.1"
+__version__ = "36.0.2"
 
 import kubernetes.aio.client as client
 
diff --git a/kubernetes/aio/client/__init__.py b/kubernetes/aio/client/__init__.py
@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-__version__ = "36.0.1"
+__version__ = "36.0.2"
 
 # import apis into sdk package
 from kubernetes.aio.client.api.well_known_api import WellKnownApi
diff --git a/kubernetes/aio/client/api_client.py b/kubernetes/aio/client/api_client.py
@@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/36.0.1/python'
+        self.user_agent = 'OpenAPI-Generator/36.0.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     async def __aenter__(self):
diff --git a/kubernetes/aio/client/api_client.py.orig b/kubernetes/aio/client/api_client.py.orig
@@ -78,7 +78,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/36.0.1/python'
+        self.user_agent = 'OpenAPI-Generator/36.0.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     async def __aenter__(self):
diff --git a/kubernetes/aio/client/configuration.py b/kubernetes/aio/client/configuration.py
@@ -415,13 +415,19 @@ async def auth_settings(self):
         :return: The Auth Settings information dict.
         """
         auth = {}
-        if 'BearerToken' in self.api_key:
+        # Backward compatibility: prior to v36.0.0 the bearer token was
+        # stored under the 'authorization' api_key. Continue to honor it
+        # so user code that sets ``config.api_key['authorization']``
+        # directly keeps working with the new 'BearerToken' key the
+        # generated client now looks for.
+        # See: https://github.com/kubernetes-client/python/issues/2595
+        if 'BearerToken' in self.api_key or 'authorization' in self.api_key:
             auth['BearerToken'] = {
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'authorization',
                 'value': await self.get_api_key_with_prefix(
-                    'BearerToken',
+                    'BearerToken', alias='authorization',
                 ),
             }
         return auth
@@ -435,7 +441,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: release-1.36\n"\
-               "SDK Package Version: 36.0.1".\
+               "SDK Package Version: 36.0.2".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
diff --git a/kubernetes/aio/client/configuration.py.orig b/kubernetes/aio/client/configuration.py.orig
@@ -432,7 +432,7 @@ conf = client.Configuration(
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: release-1.36\n"\
-               "SDK Package Version: 36.0.1".\
+               "SDK Package Version: 36.0.2".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
diff --git a/kubernetes/aio/setup.py b/kubernetes/aio/setup.py
@@ -13,7 +13,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "client"
-VERSION = "36.0.1"
+VERSION = "36.0.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/kubernetes/client/__init__.py b/kubernetes/client/__init__.py
@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-__version__ = "36.0.1"
+__version__ = "36.0.2"
 
 # import apis into sdk package
 from kubernetes.client.api.well_known_api import WellKnownApi
diff --git a/kubernetes/client/api_client.py b/kubernetes/client/api_client.py
@@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/36.0.1/python'
+        self.user_agent = 'OpenAPI-Generator/36.0.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):
diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py
@@ -406,13 +406,19 @@ def auth_settings(self):
         :return: The Auth Settings information dict.
         """
         auth = {}
-        if 'BearerToken' in self.api_key:
+        # Backward compatibility: prior to v36.0.0 the bearer token was
+        # stored under the 'authorization' api_key. Continue to honor it
+        # so user code that sets ``config.api_key['authorization']``
+        # directly keeps working with the new 'BearerToken' key the
+        # generated client now looks for.
+        # See: https://github.com/kubernetes-client/python/issues/2595
+        if 'BearerToken' in self.api_key or 'authorization' in self.api_key:
             auth['BearerToken'] = {
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'authorization',
                 'value': self.get_api_key_with_prefix(
-                    'BearerToken',
+                    'BearerToken', alias='authorization',
                 ),
             }
         return auth
@@ -426,7 +432,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: release-1.36\n"\
-               "SDK Package Version: 36.0.1".\
+               "SDK Package Version: 36.0.2".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
diff --git a/kubernetes/test/test_api_client.py b/kubernetes/test/test_api_client.py
@@ -78,3 +78,45 @@ def test_rest_proxycare(self):
             # test
             client = kubernetes.client.ApiClient(configuration=config)
             self.assertEqual( expected_pool, type(client.rest_client.pool_manager) )
+
+
+class TestConfigurationAuthSettings(unittest.TestCase):
+    """Regression tests for Configuration.auth_settings() bearer-token lookup.
+
+    Prior to v36.0.0 the generated client stored the bearer token under
+    ``api_key['authorization']`` (e.g. set by ``load_kube_config`` or by
+    user code directly). v36.0.0 switched the lookup to
+    ``api_key['BearerToken']`` without a fallback, which silently dropped
+    the Authorization header from every outgoing request and caused 401
+    Unauthorized against any cluster relying on bearer tokens.
+    See: https://github.com/kubernetes-client/python/issues/2595
+    """
+
+    def _bearer_value(self, config):
+        settings = config.auth_settings()
+        self.assertIn('BearerToken', settings)
+        return settings['BearerToken']['value']
+
+    def test_auth_settings_with_bearer_token_key(self):
+        """The new key 'BearerToken' continues to work."""
+        config = Configuration()
+        config.api_key['BearerToken'] = 'Bearer abc123'
+        self.assertEqual(self._bearer_value(config), 'Bearer abc123')
+
+    def test_auth_settings_with_authorization_key(self):
+        """Legacy key 'authorization' is honored as a fallback."""
+        config = Configuration()
+        config.api_key['authorization'] = 'Bearer abc123'
+        self.assertEqual(self._bearer_value(config), 'Bearer abc123')
+
+    def test_auth_settings_bearer_token_takes_precedence(self):
+        """When both keys are set, 'BearerToken' wins."""
+        config = Configuration()
+        config.api_key['BearerToken'] = 'Bearer new'
+        config.api_key['authorization'] = 'Bearer old'
+        self.assertEqual(self._bearer_value(config), 'Bearer new')
+
+    def test_auth_settings_with_no_token(self):
+        """No api_key entry yields an empty auth dict."""
+        config = Configuration()
+        self.assertEqual(config.auth_settings(), {})
diff --git a/scripts/constants.py b/scripts/constants.py
@@ -18,7 +18,7 @@
 KUBERNETES_BRANCH = "release-1.36"
 
 # client version for packaging and releasing.
-CLIENT_VERSION = "36.0.1"
+CLIENT_VERSION = "36.0.2"
 
 # Name of the release package
 PACKAGE_NAME = "kubernetes"
diff --git a/setup-asyncio.py b/setup-asyncio.py
@@ -16,7 +16,7 @@
 
 # Do not edit these constants. They will be updated automatically
 # by scripts/update-client.sh.
-CLIENT_VERSION = "36.0.1"
+CLIENT_VERSION = "36.0.2"
 PACKAGE_NAME = "kubernetes.aio"
 DEVELOPMENT_STATUS = "5 - Production/Stable"
 
diff --git a/setup-release.py b/setup-release.py
@@ -16,7 +16,7 @@
 
 # Do not edit these constants. They will be updated automatically
 # by scripts/update-client.sh.
-CLIENT_VERSION = "36.0.1"
+CLIENT_VERSION = "36.0.2"
 PACKAGE_NAME = "kubernetes"
 DEVELOPMENT_STATUS = "5 - Production/Stable"
 
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 # Do not edit these constants. They will be updated automatically
 # by scripts/update-client.sh.
-CLIENT_VERSION = "36.0.1"
+CLIENT_VERSION = "36.0.2"
 PACKAGE_NAME = "kubernetes"
 DEVELOPMENT_STATUS = "5 - Production/Stable"
 
