From 85a71f21c195c09e1fec74663337fdc911344aa4 Mon Sep 17 00:00:00 2001 From: John Sun Date: Tue, 14 Dec 2021 16:52:43 +1100 Subject: [PATCH 1/7] generated python-base update --- CHANGELOG.md | 8 ++++++++ kubernetes/base | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad14c9f06..95428009e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v21.0.0-snapshot + +Kubernetes API Version: To Be Updated + +### 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 diff --git a/kubernetes/base b/kubernetes/base index a66f8df1d..06191d321 160000 --- a/kubernetes/base +++ b/kubernetes/base @@ -1 +1 @@ -Subproject commit a66f8df1dfc0e4f4a17093c7da273b9e485a55a0 +Subproject commit 06191d321491abd87caaf0d049030dc87720684a From b215de5aff5a26b34ca7412b93835fc0fd28e76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Gasser?= Date: Mon, 13 Dec 2021 19:31:22 -0500 Subject: [PATCH 2/7] test: WSClient.returncode idempotence --- kubernetes/e2e_test/test_client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index eed3c909e..1ad0deb02 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/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) resp = api.delete_namespaced_pod(name=name, body={}, namespace='default') From 025c67fb84bbd9469c24d953bcd354e5e43e95ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Gasser?= Date: Mon, 13 Dec 2021 19:43:29 -0500 Subject: [PATCH 3/7] add comment --- kubernetes/e2e_test/test_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index 1ad0deb02..6700a05c2 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -221,7 +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) + self.assertEqual(client.returncode, value) # check idempotence resp = api.delete_namespaced_pod(name=name, body={}, namespace='default') From 375eb9bbb497a70ac4bc1fe252c225cf407741eb Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Dec 2021 09:53:08 -0800 Subject: [PATCH 4/7] update changelog with release notes from master branch --- CHANGELOG.md | 5 +++-- kubernetes/base | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95428009e..15b0cbe6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# v21.0.0-snapshot +# v21.7.0 + +Kubernetes API Version: v1.21.7 -Kubernetes API Version: To Be Updated ### 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) diff --git a/kubernetes/base b/kubernetes/base index 06191d321..a66f8df1d 160000 --- a/kubernetes/base +++ b/kubernetes/base @@ -1 +1 @@ -Subproject commit 06191d321491abd87caaf0d049030dc87720684a +Subproject commit a66f8df1dfc0e4f4a17093c7da273b9e485a55a0 From 2388c8a076b3e9a71f2322774f38f7b2843b5222 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Dec 2021 09:53:08 -0800 Subject: [PATCH 5/7] update version constants for 21.7.0 release --- scripts/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/constants.py b/scripts/constants.py index a1b8ecf70..149ccd848 100644 --- a/scripts/constants.py +++ b/scripts/constants.py @@ -18,13 +18,13 @@ import sys KUBERNETES_BRANCH = "release-1.21" # client version for packaging and releasing. -CLIENT_VERSION = "21.7.0b1" +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 = "4 - Beta" +DEVELOPMENT_STATUS = "5 - Production/Stable" # If called directly, return the constant value given From 359e3e3358e77c8d51aad1b40dbe4f807cdd9b2a Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Dec 2021 09:53:49 -0800 Subject: [PATCH 6/7] generated client change --- kubernetes/README.md | 2 +- kubernetes/__init__.py | 2 +- kubernetes/client/__init__.py | 2 +- kubernetes/client/api_client.py | 2 +- kubernetes/client/configuration.py | 2 +- setup.py | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kubernetes/README.md b/kubernetes/README.md index a157ef930..5d4f2b3eb 100644 --- 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.21 -- Package version: 21.7.0b1 +- Package version: 21.7.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/kubernetes/__init__.py b/kubernetes/__init__.py index 3dae94d14..b398d06f7 100644 --- a/kubernetes/__init__.py +++ b/kubernetes/__init__.py @@ -14,7 +14,7 @@ __project__ = 'kubernetes' # The version is auto-updated. Please do not edit. -__version__ = "21.7.0b1" +__version__ = "21.7.0" import kubernetes.client import kubernetes.config diff --git a/kubernetes/client/__init__.py b/kubernetes/client/__init__.py index 2b435c6a4..0891ae3e6 100644 --- a/kubernetes/client/__init__.py +++ b/kubernetes/client/__init__.py @@ -14,7 +14,7 @@ from __future__ import absolute_import -__version__ = "21.7.0b1" +__version__ = "21.7.0" # 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 index 97245a8e7..083e9d142 100644 --- a/kubernetes/client/api_client.py +++ b/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.7.0b1/python' + self.user_agent = 'OpenAPI-Generator/21.7.0/python' self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py index dcacacfe5..1f2169de6 100644 --- a/kubernetes/client/configuration.py +++ b/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.7.0b1".\ + "SDK Package Version: 21.7.0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/setup.py b/setup.py index a1215b24e..d8b59eb25 100644 --- a/setup.py +++ b/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.7.0b1" +CLIENT_VERSION = "21.7.0" PACKAGE_NAME = "kubernetes" -DEVELOPMENT_STATUS = "4 - Beta" +DEVELOPMENT_STATUS = "5 - Production/Stable" # To install the library, run the following # From f565720f8ae39286fe62f91d04f888529866c232 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Dec 2021 09:57:33 -0800 Subject: [PATCH 7/7] updated compatibility matrix and maintenance status --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e6a0cd989..e2080b374 100644 --- a/README.md +++ b/README.md @@ -90,7 +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.0b1/): Kubernetes 1.20 or below (+-), Kubernetes 1.21 (✓), Kubernetes 1.22 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. @@ -135,7 +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 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.