Merge branch 'kubernetes-client:master' into ResourceQuota_Comparison

Author: sajjadghf

.github/workflows/test.yaml

@@ -45,7 +45,7 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: "matrix.use_coverage"
-      uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2
+      uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354
       with:
         fail_ci_if_error: false
         verbose: true

CHANGELOG.md

@@ -1,3 +1,14 @@
+# v36.0.0
+
+Kubernetes API Version: v1.36.1
+
+# v36.0.0b1
+
+Kubernetes API Version: v1.36.1
+
+### Deprecation
+- Support new exec v5 websocket subprotocol (#2486, @aojea)
+
 # v36.0.0a3
 
 Kubernetes API Version: v1.36.0

README.md

@@ -134,7 +134,7 @@ supported versions of Kubernetes clusters.
 - [client 33.y.z](https://pypi.org/project/kubernetes/33.1.0/): Kubernetes 1.32 or below (+-), Kubernetes 1.33 (✓), Kubernetes 1.34 or above (+-)
 - [client 34.y.z](https://pypi.org/project/kubernetes/34.1.0/): Kubernetes 1.33 or below (+-), Kubernetes 1.34 (✓), Kubernetes 1.35 or above (+-)
 - [client 35.y.z](https://pypi.org/project/kubernetes/35.0.0/): Kubernetes 1.34 or below (+-), Kubernetes 1.35 (✓), Kubernetes 1.36 or above (+-)
-- [client 36.y.z](https://pypi.org/project/kubernetes/36.0.0b1/): Kubernetes 1.35 or below (+-), Kubernetes 1.36 (✓), Kubernetes 1.37 or above (+-)
+- [client 36.y.z](https://pypi.org/project/kubernetes/36.0.0/): Kubernetes 1.35 or below (+-), Kubernetes 1.36 (✓), Kubernetes 1.37 or above (+-)
 
 
 > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explanation of why there is no v13-v16 release.
@@ -205,12 +205,13 @@ between client-python versions.
 | 32.0 Alpha/Beta | Kubernetes main repo, 1.32 branch    | ✗                             |
 | 32.1            | Kubernetes main repo, 1.32 branch    | ✗                             |
 | 33.1 Alpha/Beta | Kubernetes main repo, 1.33 branch    | ✗                             |
-| 33.1            | Kubernetes main repo, 1.33 branch    | ✓                             |
+| 33.1            | Kubernetes main repo, 1.33 branch    | ✗                             |
 | 34.1 Alpha/Beta | Kubernetes main repo, 1.34 branch    | ✗                             |
 | 34.1            | Kubernetes main repo, 1.34 branch    | ✓                             |
 | 35.0 Alpha/Beta | Kubernetes main repo, 1.35 branch    | ✗                             |
 | 35.0            | Kubernetes main repo, 1.35 branch    | ✓                             |
-| 36.0 Alpha/Beta | Kubernetes main repo, 1.36 branch    | ✓                             |
+| 36.0 Alpha/Beta | Kubernetes main repo, 1.36 branch    | ✗                             |
+| 36.0            | Kubernetes main repo, 1.36 branch    | ✓                             |
 
 > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explanation of why there is no v13-v16 release.
 

examples/cronjob_crud.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-# -*- coding:utf-8 -*-
 
 import json
 import time

examples/duration-gep2257.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-# -*- coding:utf-8 -*-
 
 """
 This example uses kubernetes.utils.duration to parse and display

examples/pod_portforward.py

@@ -19,8 +19,7 @@
 import select
 import socket
 import time
-
-import six.moves.urllib.request as urllib_request
+from urllib import request as urllib_request
 
 from kubernetes import config
 from kubernetes.client import Configuration

kubernetes/base/config/exec_provider.py

@@ -19,7 +19,7 @@
 from .config_exception import ConfigException
 
 
-class ExecProvider(object):
+class ExecProvider:
     """
     Implementation of the proposal for out-of-tree client
     authentication providers as described here --

kubernetes/base/config/incluster_config.py

@@ -34,7 +34,7 @@ def _join_host_port(host, port):
     return template % (host, port)
 
 
-class InClusterConfigLoader(object):
+class InClusterConfigLoader:
     def __init__(self,
                  token_filename,
                  cert_filename,
@@ -88,7 +88,7 @@ def _set_config(self, client_configuration):
         client_configuration.host = self.host
         client_configuration.ssl_ca_cert = self.ssl_ca_cert
         if self.token is not None:
-            client_configuration.api_key['authorization'] = self.token
+            client_configuration.api_key['BearerToken'] = self.token
         if not self._try_refresh_token:
             return
 

kubernetes/base/config/incluster_config_test.py

@@ -91,7 +91,7 @@ def test_refresh_token(self):
         loader.load_and_set(config)
 
         self.assertEqual('bearer ' + _TEST_TOKEN,
-                         config.get_api_key_with_prefix('authorization'))
+                         config.get_api_key_with_prefix('BearerToken'))
         self.assertEqual('bearer ' + _TEST_TOKEN, loader.token)
         self.assertIsNotNone(loader.token_expires_at)
 
@@ -100,14 +100,31 @@ def test_refresh_token(self):
         loader._token_filename = self._create_file_with_temp_content(
             _TEST_NEW_TOKEN)
         self.assertEqual('bearer ' + _TEST_TOKEN,
-                         config.get_api_key_with_prefix('authorization'))
+                         config.get_api_key_with_prefix('BearerToken'))
 
         loader.token_expires_at = datetime.datetime.now()
         self.assertEqual('bearer ' + _TEST_NEW_TOKEN,
-                         config.get_api_key_with_prefix('authorization'))
+                         config.get_api_key_with_prefix('BearerToken'))
         self.assertEqual('bearer ' + _TEST_NEW_TOKEN, loader.token)
         self.assertGreater(loader.token_expires_at, old_token_expires_at)
 
+    def test_load_incluster_sets_request_authorization_header(self):
+        from kubernetes.client import ApiClient
+        cert_filename = self._create_file_with_temp_content(_TEST_CERT)
+        loader = self.get_test_loader(cert_filename=cert_filename)
+        config = Configuration()
+        loader.load_and_set(config)
+
+        api_client = ApiClient(config)
+        headers = {}
+        api_client.update_params_for_auth(headers, [], ['BearerToken'])
+
+        self.assertIn('authorization', headers)
+        self.assertTrue(
+            headers['authorization'].lower().startswith('bearer '),
+            "Expected a Bearer authorization header, got: %r"
+            % headers['authorization'])
+
     def _should_fail_load(self, config_loader, reason):
         try:
             config_loader.load_and_set()

kubernetes/base/config/kube_config.py

@@ -22,14 +22,12 @@
 import platform
 import subprocess
 import tempfile
-import time
 from collections import namedtuple
 
 import oauthlib.oauth2
 import urllib3
 import yaml
 from requests_oauthlib import OAuth2Session
-from six import PY3
 
 from kubernetes.client import ApiClient, Configuration
 from kubernetes.config.exec_provider import ExecProvider
@@ -85,7 +83,7 @@ def _is_expired(expiry):
             datetime.datetime.now(tz=UTC))
 
 
-class FileOrData(object):
+class FileOrData:
     """Utility class to read content of obj[%data_key_name] or file's
      content of obj[%file_key_name] and represent it as file or data.
      Note that the data is preferred. The obj[%file_key_name] will be used iff
@@ -151,7 +149,7 @@ def _write_file(self, force_rewrite=False):
                 self._data, self._temp_file_path, force_recreate=force_rewrite)
 
 
-class CommandTokenSource(object):
+class CommandTokenSource:
     def __init__(self, cmd, args, tokenKey, expiryKey):
         self._cmd = cmd
         self._args = args
@@ -191,7 +189,7 @@ def token(self):
             expiry=parse_rfc3339(data['credential']['token_expiry']))
 
 
-class KubeConfigLoader(object):
+class KubeConfigLoader:
 
     def __init__(self, config_dict, active_context=None,
                  get_google_credentials=None,
@@ -363,14 +361,9 @@ def _load_oid_token(self, provider):
             # https://tools.ietf.org/html/rfc7515#appendix-C
             return
 
-        if PY3:
-            jwt_attributes = json.loads(
-                base64.urlsafe_b64decode(parts[1] + padding).decode('utf-8')
-            )
-        else:
-            jwt_attributes = json.loads(
-                base64.b64decode(parts[1] + padding)
-            )
+        jwt_attributes = json.loads(
+            base64.urlsafe_b64decode(parts[1] + padding).decode('utf-8')
+        )
 
         expire = jwt_attributes.get('exp')
 
@@ -392,14 +385,9 @@ def _refresh_oidc(self, provider):
         if 'idp-certificate-authority-data' in provider['config']:
             ca_cert = tempfile.NamedTemporaryFile(delete=True)
 
-            if PY3:
-                cert = base64.b64decode(
-                    provider['config']['idp-certificate-authority-data']
-                ).decode('utf-8')
-            else:
-                cert = base64.b64decode(
-                    provider['config']['idp-certificate-authority-data'] + "=="
-                )
+            cert = base64.b64decode(
+                provider['config']['idp-certificate-authority-data']
+            ).decode('utf-8')
 
             with open(ca_cert.name, 'w') as fh:
                 fh.write(cert)
@@ -539,7 +527,7 @@ def _load_cluster_info(self):
 
     def _set_config(self, client_configuration):
         if 'token' in self.__dict__:
-            client_configuration.api_key['authorization'] = self.token
+            client_configuration.api_key['BearerToken'] = self.token
 
             def _refresh_api_key(client_configuration):
                 if ('expiry' in self.__dict__ and _is_expired(self.expiry)):
@@ -565,7 +553,7 @@ def current_context(self):
         return self._current_context.value
 
 
-class ConfigNode(object):
+class ConfigNode:
     """Remembers each config key's path and construct a relevant exception
     message in case of missing keys. The assumption is all access keys are
     present in a well-formed kube-config."""