Skip to content

Commit

Permalink
Merge pull request #2011 from yliaog/automated-release-of-26.1.0-upst…
Browse files Browse the repository at this point in the history
…ream-release-26.0-1676440996

Automated release of 26.1.0 upstream release 26.0 1676440996
  • Loading branch information
k8s-ci-robot committed Feb 15, 2023
2 parents b37946f + 332e1fb commit 1f9d3b0
Show file tree
Hide file tree
Showing 15 changed files with 83 additions and 15 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/e2e-release-26.0.yaml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions .github/workflows/kind-configs/cluster-1.26.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/.openapi-generator/swagger.json.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ca8e42406994951820c2307a6f2ee6d6f4a846b5b46a6f4ebe5e28678d03d160
cee34aa4c662a6d749a5d924b37bf5e15218ca9ab8dbca9f629d51018fb9ba84
2 changes: 1 addition & 1 deletion kubernetes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 4 additions & 1 deletion kubernetes/swagger.json.unprocessed
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions scripts/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion scripts/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down

0 comments on commit 1f9d3b0

Please sign in to comment.