Merge pull request #1655 from yliaog/update-21-base-2

Update submodule to the same version as master branch

.github/workflows/e2e-master.yaml

@@ -30,7 +30,7 @@ jobs:
         # as we sync with Kubernetes upstream
         config: .github/workflows/kind-configs/cluster-1.18.yaml
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/e2e-release-11.0.yaml

@@ -30,7 +30,7 @@ jobs:
         # as we sync with Kubernetes upstream
         config: .github/workflows/kind-configs/cluster-1.15.yaml
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/e2e-release-12.0.yaml

@@ -30,7 +30,7 @@ jobs:
         # as we sync with Kubernetes upstream
         config: .github/workflows/kind-configs/cluster-1.16.yaml
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/e2e-release-17.0.yaml

@@ -30,7 +30,7 @@ jobs:
         # as we sync with Kubernetes upstream
         config: .github/workflows/kind-configs/cluster-1.17.yaml
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/e2e-release-18.0.yaml

@@ -30,7 +30,7 @@ jobs:
         # as we sync with Kubernetes upstream
         config: .github/workflows/kind-configs/cluster-1.18.yaml
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/test.yaml

@@ -15,7 +15,7 @@ jobs:
       with:
         submodules: true
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

CHANGELOG.md

@@ -1,4 +1,18 @@
-# v21.0.0-snapshot
+# v21.7.0
+
+Kubernetes API Version: v1.21.7
+
+
+### Bug or Regression
+- Fixed kubernetes-client/python#741, an issue which prevented Kubernetes cluster api-tokens from exec-plugin auth providers from being refreshed after expiry. (#250, @emenendez)
+- Use select.poll() for exec on linux/darwin to improve scalability of WSClient (#268, @jsun-splunk)
+
+# v21.7.0b1
+
+Kubernetes API Version: v1.21.7
+
+
+# v21.7.0a1
 
 Kubernetes API Version: v1.21.7
 

README.md

@@ -90,6 +90,7 @@ supported versions of Kubernetes clusters.
 - [client 18.y.z](https://pypi.org/project/kubernetes/18.20.0/): Kubernetes 1.17 or below (+-), Kubernetes 1.18 (✓), Kubernetes 1.19 or above (+-)
 - [client 19.y.z](https://pypi.org/project/kubernetes/19.15.0/): Kubernetes 1.18 or below (+-), Kubernetes 1.19 (✓), Kubernetes 1.20 or above (+-)
 - [client 20.y.z](https://pypi.org/project/kubernetes/20.13.0/): Kubernetes 1.19 or below (+-), Kubernetes 1.20 (✓), Kubernetes 1.21 or above (+-)
+- [client 21.y.z](https://pypi.org/project/kubernetes/21.7.0/): Kubernetes 1.20 or below (+-), Kubernetes 1.21 (✓), Kubernetes 1.22 or above (+-)
 
 > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explaination of why there is no v13-v16 release.
 
@@ -125,7 +126,7 @@ between client-python versions.
 | 11.0 Alpha/Beta | Kubernetes main repo, 1.15 branch    | ✗                             |
 | 11.0            | Kubernetes main repo, 1.15 branch    | ✗                             |
 | 12.0 Alpha/Beta | Kubernetes main repo, 1.16 branch    | ✗                             |
-| 12.0            | Kubernetes main repo, 1.16 branch    | ✓                             |
+| 12.0            | Kubernetes main repo, 1.16 branch    | ✗                             |
 | 17.0 Alpha/Beta | Kubernetes main repo, 1.17 branch    | ✗                             |
 | 17.0            | Kubernetes main repo, 1.17 branch    | ✓                             |
 | 18.0 Alpha/Beta | Kubernetes main repo, 1.18 branch    | ✗                             |
@@ -134,6 +135,8 @@ between client-python versions.
 | 19.0            | Kubernetes main repo, 1.19 branch    | ✓                             |
 | 20.0 Alpha/Beta | Kubernetes main repo, 1.20 branch    | ✗                             |
 | 20.0            | Kubernetes main repo, 1.20 branch    | ✓                             |
+| 21.0 Alpha/Beta | Kubernetes main repo, 1.21 branch    | ✗                             |
+| 21.0            | Kubernetes main repo, 1.21 branch    | ✓                             |
 
 > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explaination of why there is no v13-v16 release.
 

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.21
-- Package version: 21.0.0-snapshot
+- Package version: 21.7.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.

kubernetes/__init__.py

@@ -14,7 +14,7 @@
 
 __project__ = 'kubernetes'
 # The version is auto-updated. Please do not edit.
-__version__ = "21.0.0-snapshot"
+__version__ = "21.7.0"
 
 import kubernetes.client
 import kubernetes.config

kubernetes/base

@@ -1 +1 @@
-Subproject commit a66f8df1dfc0e4f4a17093c7da273b9e485a55a0
+Subproject commit 06191d321491abd87caaf0d049030dc87720684a

kubernetes/client/__init__.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-__version__ = "21.0.0-snapshot"
+__version__ = "21.7.0"
 
 # import apis into sdk package
 from kubernetes.client.api.well_known_api import WellKnownApi

kubernetes/client/api_client.py

@@ -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/21.0.0-snapshot/python'
+        self.user_agent = 'OpenAPI-Generator/21.7.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):

kubernetes/client/configuration.py

@@ -350,7 +350,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: release-1.21\n"\
-               "SDK Package Version: 21.0.0-snapshot".\
+               "SDK Package Version: 21.7.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

kubernetes/e2e_test/test_client.py

@@ -221,6 +221,7 @@ class TestClient(unittest.TestCase):
             self.assertIsNone(client.returncode)
             client.run_forever(timeout=10)
             self.assertEqual(client.returncode, value)
+            self.assertEqual(client.returncode, value)  # check idempotence
 
         resp = api.delete_namespaced_pod(name=name, body={},
                                          namespace='default')

scripts/constants.py

@@ -18,13 +18,13 @@ import sys
 KUBERNETES_BRANCH = "release-1.21"
 
 # client version for packaging and releasing.
-CLIENT_VERSION = "21.0.0-snapshot"
+CLIENT_VERSION = "21.7.0"
 
 # Name of the release package
 PACKAGE_NAME = "kubernetes"
 
 # Stage of development, mainly used in setup.py's classifiers.
-DEVELOPMENT_STATUS = "3 - Alpha"
+DEVELOPMENT_STATUS = "5 - Production/Stable"
 
 
 # If called directly, return the constant value given

setup.py

@@ -16,9 +16,9 @@ from setuptools import setup
 
 # Do not edit these constants. They will be updated automatically
 # by scripts/update-client.sh.
-CLIENT_VERSION = "21.0.0-snapshot"
+CLIENT_VERSION = "21.7.0"
 PACKAGE_NAME = "kubernetes"
-DEVELOPMENT_STATUS = "3 - Alpha"
+DEVELOPMENT_STATUS = "5 - Production/Stable"
 
 # To install the library, run the following
 #
@@ -61,7 +61,8 @@ setup(
               'kubernetes.watch', 'kubernetes.client.api',
               'kubernetes.stream', 'kubernetes.client.models',
               'kubernetes.utils', 'kubernetes.client.apis',
-              'kubernetes.dynamic', 'kubernetes.leaderelection'],
+              'kubernetes.dynamic', 'kubernetes.leaderelection',
+              'kubernetes.leaderelection.resourcelock'],
     include_package_data=True,
     long_description="Python client for kubernetes http://kubernetes.io/",
     python_requires='>=3.6',