From 28b62fdb13ad04b429fa07125e2ac3c1fa2f4cc3 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Mon, 30 Jan 2023 22:57:54 +0000 Subject: [PATCH 1/7] added 3.11 to the tests --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 39d14abb2f..f54829b66c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.10"] + python-version: ["3.7", "3.8", "3.10", "3.11"] include: - python-version: "3.9" use_coverage: 'coverage' From 9d741dda0a279ccac8e3c1649958b9966ea14abd Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Tue, 31 Jan 2023 05:47:34 +0000 Subject: [PATCH 2/7] added release 1.26 e2e --- .github/workflows/e2e-release-26.0.yaml | 44 +++++++++++++++++++ .../workflows/kind-configs/cluster-1.26.yaml | 7 +++ 2 files changed, 51 insertions(+) create mode 100644 .github/workflows/e2e-release-26.0.yaml create mode 100644 .github/workflows/kind-configs/cluster-1.26.yaml diff --git a/.github/workflows/e2e-release-26.0.yaml b/.github/workflows/e2e-release-26.0.yaml new file mode 100644 index 0000000000..a03df08549 --- /dev/null +++ b/.github/workflows/e2e-release-26.0.yaml @@ -0,0 +1,44 @@ +name: End to End Tests - release-26.0 + +on: + push: + branches: + - release-26.0 + pull_request: + branches: + - release-26.0 + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.7, 3.8, 3.9] + steps: + - uses: actions/checkout@v3 + with: + submodules: true + - name: Create Kind Cluster + uses: helm/kind-action@v1.5.0 + with: + cluster_name: kubernetes-python-e2e-release-26.0-${{ matrix.python-version }} + # The kind version to be used to spin the cluster up + # this needs to be updated whenever a new Kind version is released + version: v0.17.0 + # Update the config here whenever a new client snapshot is performed + # This would eventually point to cluster with the latest Kubernetes version + # as we sync with Kubernetes upstream + config: .github/workflows/kind-configs/cluster-1.26.yaml + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -r requirements.txt + python -m pip install -r test-requirements.txt + - name: Install package + run: python -m pip install -e . + - name: Run End to End tests + run: pytest -vvv -s kubernetes/e2e_test diff --git a/.github/workflows/kind-configs/cluster-1.26.yaml b/.github/workflows/kind-configs/cluster-1.26.yaml new file mode 100644 index 0000000000..d8ec1dec0f --- /dev/null +++ b/.github/workflows/kind-configs/cluster-1.26.yaml @@ -0,0 +1,7 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane + image: kindest/node:v1.26.0@sha256:3264cbae4b80c241743d12644b2506fff13dce07fcadf29079c1d06a47b399dd +- role: worker + image: kindest/node:v1.26.0@sha256:3264cbae4b80c241743d12644b2506fff13dce07fcadf29079c1d06a47b399dd From 7e0967d6d44ae3cd7a4a13ec109468ed693fca99 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Feb 2023 06:03:23 +0000 Subject: [PATCH 3/7] update changelog with release notes from master branch --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f06a7879d..38a1e54944 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# v26.1.0 + +Kubernetes API Version: v1.26.1 + +### Bug or Regression +- The timeout unit of the WSClient update method is now always seconds for both poll and select functions. (#1976, @t-yrka) + +### Feature +- Adds support for loading CA certificates from a file using the `idp-certificate-authority` key for the oidc plugin. (#1916, @vgupta3) + # v26.1.0b1 Kubernetes API Version: v1.26.1 From e758a219d83965b33e08ffb0495193a3c1b151b8 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Feb 2023 06:03:23 +0000 Subject: [PATCH 4/7] update version constants for 26.1.0 release --- scripts/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/constants.py b/scripts/constants.py index 00e898b8aa..42ef9a9f64 100644 --- a/scripts/constants.py +++ b/scripts/constants.py @@ -18,13 +18,13 @@ KUBERNETES_BRANCH = "release-1.26" # client version for packaging and releasing. -CLIENT_VERSION = "26.1.0b1" +CLIENT_VERSION = "26.1.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 724375448ced86526f9c3914f65b07a9c3c9b83f Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Feb 2023 06:03:44 +0000 Subject: [PATCH 5/7] generated API change --- kubernetes/swagger.json.unprocessed | 5 ++++- scripts/swagger.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kubernetes/swagger.json.unprocessed b/kubernetes/swagger.json.unprocessed index 83f031f570..f274347d64 100644 --- a/kubernetes/swagger.json.unprocessed +++ b/kubernetes/swagger.json.unprocessed @@ -13136,7 +13136,10 @@ "$ref": "#/definitions/io.k8s.api.resource.v1alpha1.ResourceClaimConsumerReference" }, "type": "array", - "x-kubernetes-list-type": "set" + "x-kubernetes-list-map-keys": [ + "uid" + ], + "x-kubernetes-list-type": "map" } }, "type": "object" diff --git a/scripts/swagger.json b/scripts/swagger.json index 92f7aab35e..b163504491 100644 --- a/scripts/swagger.json +++ b/scripts/swagger.json @@ -13208,7 +13208,10 @@ "$ref": "#/definitions/v1alpha1.ResourceClaimConsumerReference" }, "type": "array", - "x-kubernetes-list-type": "set" + "x-kubernetes-list-map-keys": [ + "uid" + ], + "x-kubernetes-list-type": "map" } }, "type": "object" From a688be31b8919b70d233d41b44ef5344e809bca7 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Feb 2023 06:03:45 +0000 Subject: [PATCH 6/7] generated client change --- kubernetes/.openapi-generator/swagger.json.sha256 | 2 +- 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 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kubernetes/.openapi-generator/swagger.json.sha256 b/kubernetes/.openapi-generator/swagger.json.sha256 index f531148430..c0cd5d90fb 100644 --- a/kubernetes/.openapi-generator/swagger.json.sha256 +++ b/kubernetes/.openapi-generator/swagger.json.sha256 @@ -1 +1 @@ -ca8e42406994951820c2307a6f2ee6d6f4a846b5b46a6f4ebe5e28678d03d160 \ No newline at end of file +cee34aa4c662a6d749a5d924b37bf5e15218ca9ab8dbca9f629d51018fb9ba84 \ No newline at end of file diff --git a/kubernetes/README.md b/kubernetes/README.md index 23af221ffe..b63b691ec1 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.26 -- Package version: 26.1.0b1 +- Package version: 26.1.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/kubernetes/__init__.py b/kubernetes/__init__.py index 4605597bd1..fbe25b55d4 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__ = "26.1.0b1" +__version__ = "26.1.0" from . import client from . import config diff --git a/kubernetes/client/__init__.py b/kubernetes/client/__init__.py index f25a34da00..128c9c3425 100644 --- a/kubernetes/client/__init__.py +++ b/kubernetes/client/__init__.py @@ -14,7 +14,7 @@ from __future__ import absolute_import -__version__ = "26.1.0b1" +__version__ = "26.1.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 227c6928bd..8ab36876d4 100644 --- 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/26.1.0b1/python' + self.user_agent = 'OpenAPI-Generator/26.1.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 743bdac359..73772d79bb 100644 --- a/kubernetes/client/configuration.py +++ b/kubernetes/client/configuration.py @@ -350,7 +350,7 @@ def to_debug_report(self): "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: release-1.26\n"\ - "SDK Package Version: 26.1.0b1".\ + "SDK Package Version: 26.1.0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/setup.py b/setup.py index 9ff15ecaaa..f86f6c3100 100644 --- a/setup.py +++ b/setup.py @@ -16,9 +16,9 @@ # Do not edit these constants. They will be updated automatically # by scripts/update-client.sh. -CLIENT_VERSION = "26.1.0b1" +CLIENT_VERSION = "26.1.0" PACKAGE_NAME = "kubernetes" -DEVELOPMENT_STATUS = "4 - Beta" +DEVELOPMENT_STATUS = "5 - Production/Stable" # To install the library, run the following # From 332e1fb22c7788ce5afa036b4a080712f41f4c35 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Wed, 15 Feb 2023 06:07:39 +0000 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 b17e20fb85..843fd0d90e 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ supported versions of Kubernetes clusters. - [client 23.y.z](https://pypi.org/project/kubernetes/23.6.0/): Kubernetes 1.22 or below (+-), Kubernetes 1.23 (✓), Kubernetes 1.24 or above (+-) - [client 24.y.z](https://pypi.org/project/kubernetes/24.2.0/): Kubernetes 1.23 or below (+-), Kubernetes 1.24 (✓), Kubernetes 1.25 or above (+-) - [client 25.y.z](https://pypi.org/project/kubernetes/25.3.0/): Kubernetes 1.24 or below (+-), Kubernetes 1.25 (✓), Kubernetes 1.26 or above (+-) -- [client 26.y.z](https://pypi.org/project/kubernetes/26.1.0b1/): Kubernetes 1.25 or below (+-), Kubernetes 1.26 (✓), Kubernetes 1.27 or above (+-) +- [client 26.y.z](https://pypi.org/project/kubernetes/26.1.0/): Kubernetes 1.25 or below (+-), Kubernetes 1.26 (✓), Kubernetes 1.27 or above (+-) > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explanation of why there is no v13-v16 release. @@ -150,7 +150,8 @@ between client-python versions. | 24.0 | Kubernetes main repo, 1.24 branch | ✓ | | 25.0 Alpha/Beta | Kubernetes main repo, 1.25 branch | ✗ | | 25.0 | Kubernetes main repo, 1.25 branch | ✓ | -| 26.0 Alpha/Beta | Kubernetes main repo, 1.26 branch | ✓ | +| 26.0 Alpha/Beta | Kubernetes main repo, 1.26 branch | ✗ | + 26.0 | Kubernetes main repo, 1.26 branch | ✓ | > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explanation of why there is no v13-v16 release.