Skip to content

Commit 0b53d52

Browse files
yabeayabea
authored
Merge branch 'kubernetes-client:master' into master
2 parents ae43d0c + 56eea10 commit 0b53d52

File tree

894 files changed

+77181
-98772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

894 files changed

+77181
-98772
lines changed

‎.github/workflows/e2e-master.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python-version: [3.6, 3.7, 3.8, 3.9]
16+
python-version: [3.7, 3.8, 3.9]
1717
steps:
1818
- uses: actions/checkout@v3
1919
with:
2020
submodules: true
2121
- name: Create Kind Cluster
22-
uses: helm/kind-action@v1.4.0
22+
uses: helm/kind-action@v1.5.0
2323
with:
2424
cluster_name: kubernetes-python-e2e-master-${{ matrix.python-version }}
2525
# The kind version to be used to spin the cluster up
2626
# this needs to be updated whenever a new Kind version is released
27-
version: v0.11.1
27+
version: v0.17.0
2828
# Update the config here whenever a new client snapshot is performed
2929
# This would eventually point to cluster with the latest Kubernetes version
3030
# as we sync with Kubernetes upstream
31-
config: .github/workflows/kind-configs/cluster-1.18.yaml
31+
config: .github/workflows/kind-configs/cluster-1.25.yaml
3232
- name: Set up Python ${{ matrix.python-version }}
3333
uses: actions/setup-python@v4
3434
with:

‎.github/workflows/e2e-release-26.0.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: End to End Tests - release-26.0
2+
3+
on:
4+
push:
5+
branches:
6+
- release-26.0
7+
pull_request:
8+
branches:
9+
- release-26.0
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
python-version: [3.7, 3.8, 3.9]
17+
steps:
18+
- uses: actions/checkout@v3
19+
with:
20+
submodules: true
21+
- name: Create Kind Cluster
22+
uses: helm/[email protected]
23+
with:
24+
cluster_name: kubernetes-python-e2e-release-26.0-${{ matrix.python-version }}
25+
# The kind version to be used to spin the cluster up
26+
# this needs to be updated whenever a new Kind version is released
27+
version: v0.17.0
28+
# Update the config here whenever a new client snapshot is performed
29+
# This would eventually point to cluster with the latest Kubernetes version
30+
# as we sync with Kubernetes upstream
31+
config: .github/workflows/kind-configs/cluster-1.26.yaml
32+
- name: Set up Python ${{ matrix.python-version }}
33+
uses: actions/setup-python@v4
34+
with:
35+
python-version: ${{ matrix.python-version }}
36+
- name: Install dependencies
37+
run: |
38+
python -m pip install --upgrade pip
39+
python -m pip install -r requirements.txt
40+
python -m pip install -r test-requirements.txt
41+
- name: Install package
42+
run: python -m pip install -e .
43+
- name: Run End to End tests
44+
run: pytest -vvv -s kubernetes/e2e_test

‎.github/workflows/kind-configs/cluster-1.25.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
kind: Cluster
2+
apiVersion: kind.x-k8s.io/v1alpha4
3+
nodes:
4+
- role: control-plane
5+
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365
6+
- role: worker
7+
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365

‎.github/workflows/kind-configs/cluster-1.26.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
kind: Cluster
2+
apiVersion: kind.x-k8s.io/v1alpha4
3+
nodes:
4+
- role: control-plane
5+
image: kindest/node:v1.26.0@sha256:3264cbae4b80c241743d12644b2506fff13dce07fcadf29079c1d06a47b399dd
6+
- role: worker
7+
image: kindest/node:v1.26.0@sha256:3264cbae4b80c241743d12644b2506fff13dce07fcadf29079c1d06a47b399dd

‎.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
python-version: ["3.6", "3.7", "3.8", "3.10"]
10+
python-version: ["3.7", "3.8", "3.10", "3.11"]
1111
include:
1212
- python-version: "3.9"
1313
use_coverage: 'coverage'
@@ -46,5 +46,5 @@ jobs:
4646
if: "matrix.use_coverage"
4747
uses: codecov/codecov-action@v3
4848
with:
49-
fail_ci_if_error: true
49+
fail_ci_if_error: false
5050
verbose: true

‎.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,3 @@ target/
6767
.idea/*
6868
*.iml
6969
.vscode
70-
71-
# created by sphinx documentation build
72-
doc/source/README.md
73-
doc/_build

‎CHANGELOG.md

Lines changed: 327 additions & 0 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ supported versions of Kubernetes clusters.
9494
- [client 22.y.z](https://pypi.org/project/kubernetes/22.6.0/): Kubernetes 1.21 or below (+-), Kubernetes 1.22 (✓), Kubernetes 1.23 or above (+-)
9595
- [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 (+-)
9696
- [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 (+-)
97+
- [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 (+-)
98+
- [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 (+-)
9799

98100
> See [here](#homogenizing-the-kubernetes-python-client-versions) for an explanation of why there is no v13-v16 release.
99101
@@ -141,11 +143,15 @@ between client-python versions.
141143
| 21.0 Alpha/Beta | Kubernetes main repo, 1.21 branch | ✗ |
142144
| 21.0 | Kubernetes main repo, 1.21 branch | ✗ |
143145
| 22.0 Alpha/Beta | Kubernetes main repo, 1.22 branch | ✗ |
144-
| 22.0 | Kubernetes main repo, 1.22 branch | ✓ |
146+
| 22.0 | Kubernetes main repo, 1.22 branch | ✗ |
145147
| 23.0 Alpha/Beta | Kubernetes main repo, 1.23 branch | ✗ |
146-
| 23.0 | Kubernetes main repo, 1.23 branch | ✓ |
148+
| 23.0 | Kubernetes main repo, 1.23 branch | ✗ |
147149
| 24.0 Alpha/Beta | Kubernetes main repo, 1.24 branch | ✗ |
148150
| 24.0 | Kubernetes main repo, 1.24 branch | ✓ |
151+
| 25.0 Alpha/Beta | Kubernetes main repo, 1.25 branch | ✗ |
152+
| 25.0 | Kubernetes main repo, 1.25 branch | ✓ |
153+
| 26.0 Alpha/Beta | Kubernetes main repo, 1.26 branch | ✗ |
154+
26.0 | Kubernetes main repo, 1.26 branch | ✓ |
149155

150156
> See [here](#homogenizing-the-kubernetes-python-client-versions) for an explanation of why there is no v13-v16 release.
151157
@@ -210,3 +216,5 @@ This will cause a failure in non-exec/attach calls. If you reuse your api clien
210216
recreate it between api calls that use _stream_ and other api calls.
211217

212218
See more at [exec example](examples/pod_exec.py).
219+
220+
**[⬆ back to top](#Installation)**

‎doc/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source/README.md
2+
source/CONTRIBUTING.md
3+
source/kubernetes.*
4+
build

‎doc/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33

44
# You can set these variables from the command line.
5+
SPHINXAPIDOC = sphinx-apidoc
56
SPHINXOPTS = -c source
67
SPHINXBUILD = sphinx-build
78
SPHINXPROJ = kubernetes-python
@@ -17,5 +18,6 @@ help:
1718
# Catch-all target: route all unknown targets to Sphinx using the new
1819
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1920
html:
21+
$(SPHINXAPIDOC) -o "$(SOURCEDIR)" ../kubernetes/ -e -f
2022
$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
2123
@echo "\nDocs rendered successfully, open _/build/html/index.html to view"

‎doc/source/README.md

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)