Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CPREQ-8832] Support Kubernetes v1.30.1 #647

Merged
merged 5 commits into from
May 22, 2024
Merged

[CPREQ-8832] Support Kubernetes v1.30.1 #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f551337
Add v1.30.0 and run scripts/thirdparties/sync.py
ilia1243 Apr 23, 2024
5acab8d
Add supported kubernetes version v1.30.0 in Installation.md
ilia1243 Apr 23, 2024
b830220
Fix backup procudure to support new types ValidatingAdmissionPolicyLi…
ilia1243 Apr 26, 2024
d4516e7
Update to v1.30.1
ilia1243 May 17, 2024
e9f50e4
Update docs and backup.py
ilia1243 May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions documentation/Installation.md
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion kubemarine/procedures/backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,18 @@ def _handle(self, payload: ParserPayload) -> None:
items_by_resource: Dict[str, List[str]] = {}

def append_item(api_version: str, kind: str, item: str) -> None:
resource_name = next(r['name'] for r in resources if r['apiVersion'] == api_version and r['kind'] == kind)
resource_name = next((
r['name'] for r in resources
if r['apiVersion'] == api_version
and (r['kind'] == kind
# TODO remove this W/A for future releases having https://github.com/kubernetes/kubectl/issues/1593 resolved
or kind in ('ValidatingAdmissionPolicyList', 'ValidatingAdmissionPolicyBindingList')
and r['kind'] == kind[:-len('List')])
), None)

if resource_name is None:
raise Exception(f"Failed to find resource name for apiVersion: {api_version}, kind: {kind}")

items_by_resource.setdefault(resource_name, []).append(item)

with gzip.open(payload.resource_path, 'rt', encoding='utf-8') as file:
Expand Down
14 changes: 14 additions & 0 deletions kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ kube-apiserver:
version: v1.29.1
v1.29.4:
version: v1.29.4
v1.30.1:
version: v1.30.1
kube-controller-manager:
v1.23.1:
version: v1.23.1
Expand Down Expand Up @@ -98,6 +100,8 @@ kube-controller-manager:
version: v1.29.1
v1.29.4:
version: v1.29.4
v1.30.1:
version: v1.30.1
kube-scheduler:
v1.23.1:
version: v1.23.1
Expand Down Expand Up @@ -147,6 +151,8 @@ kube-scheduler:
version: v1.29.1
v1.29.4:
version: v1.29.4
v1.30.1:
version: v1.30.1
kube-proxy:
v1.23.1:
version: v1.23.1
Expand Down Expand Up @@ -196,6 +202,8 @@ kube-proxy:
version: v1.29.1
v1.29.4:
version: v1.29.4
v1.30.1:
version: v1.30.1
pause:
v1.23.1:
version: '3.6'
Expand Down Expand Up @@ -245,6 +253,8 @@ pause:
version: '3.9'
v1.29.4:
version: '3.9'
v1.30.1:
version: '3.9'
etcd:
v1.23.1:
version: 3.5.1-0
Expand Down Expand Up @@ -294,6 +304,8 @@ etcd:
version: 3.5.10-0
v1.29.4:
version: 3.5.12-0
v1.30.1:
version: 3.5.12-0
coredns/coredns:
v1.23.1:
version: v1.8.6
Expand Down Expand Up @@ -343,3 +355,5 @@ coredns/coredns:
version: v1.11.1
v1.29.4:
version: v1.11.1
v1.30.1:
version: v1.11.1
12 changes: 12 additions & 0 deletions kubemarine/resources/configurations/compatibility/internal/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ docker:
version_rhel8: 19.03*
version_rhel9: 20.10*
version_debian: 5:20.10.*
v1.30.1:
version_rhel: 19.03*
version_rhel8: 19.03*
version_rhel9: 20.10*
version_debian: 5:20.10.*
containerd:
v1.23.1:
version_debian: 1.5.*
Expand Down Expand Up @@ -174,6 +179,8 @@ containerd:
version_debian: 1.6.*
v1.29.4:
version_debian: 1.6.*
v1.30.1:
version_debian: 1.6.*
containerdio:
v1.23.1:
version_rhel: 1.6*
Expand Down Expand Up @@ -295,6 +302,11 @@ containerdio:
version_rhel8: 1.6*
version_rhel9: 1.6*
version_debian: 1.6.*
v1.30.1:
version_rhel: 1.6*
version_rhel8: 1.6*
version_rhel9: 1.6*
version_debian: 1.6.*
haproxy:
version_rhel: 1.8*
version_rhel8: 1.8*
Expand Down
11 changes: 11 additions & 0 deletions kubemarine/resources/configurations/compatibility/internal/plugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ calico:
version: v3.27.0
v1.29.4:
version: v3.27.3
v1.30.1:
version: v3.27.3
nginx-ingress-controller:
v1.23.1:
version: v1.2.0
Expand Down Expand Up @@ -126,6 +128,9 @@ nginx-ingress-controller:
v1.29.4:
version: v1.10.1
webhook-version: v1.4.1
v1.30.1:
version: v1.10.1
webhook-version: v1.4.1
kubernetes-dashboard:
v1.23.1:
version: v2.5.1
Expand Down Expand Up @@ -199,6 +204,9 @@ kubernetes-dashboard:
v1.29.4:
version: v2.7.0
metrics-scraper-version: v1.0.8
v1.30.1:
version: v2.7.0
metrics-scraper-version: v1.0.8
local-path-provisioner:
v1.23.1:
version: v0.0.22
Expand Down Expand Up @@ -272,3 +280,6 @@ local-path-provisioner:
v1.29.4:
version: v0.0.26
busybox-version: 1.34.1
v1.30.1:
version: v0.0.26
busybox-version: 1.34.1
12 changes: 12 additions & 0 deletions kubemarine/resources/configurations/compatibility/internal/thirdparties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ kubeadm:
sha1: 14390d6df2bb0b6546efd2238068c300461053fd
v1.29.4:
sha1: de2dbed32d3ba125522aa7a7a4e278400d6d4855
v1.30.1:
sha1: 85385f4b78b79bd1cd4d1ad5244422d372d5f758
kubelet:
v1.23.1:
sha1: 4a7e2e5f5e6b8e95efa52931786bc275a037bc50
Expand Down Expand Up @@ -99,6 +101,8 @@ kubelet:
sha1: aa871f4656bf1cc6393058f28d5c938268df3d4e
v1.29.4:
sha1: f019ec5abe443bf20ef711ebbc971f51b7a1a34d
v1.30.1:
sha1: c62da6ab918b8e56d7c9b77e642ffc73ffdbffac
kubectl:
v1.23.1:
sha1: 4ceb8d046a2d8253495aa86d13f11e2eb29644fc
Expand Down Expand Up @@ -148,6 +152,8 @@ kubectl:
sha1: 5867f210ce90c62e0551062492751e43c2ae6a46
v1.29.4:
sha1: ea298117fbf1d3f4b85f491ccec622e0599c9248
v1.30.1:
sha1: bced94239f1dbdb04d3a661a067bf9587865b6e8
calicoctl:
# calicoctl version is duplicated from kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml
# It also corresponds to the plugin version in kubemarine/resources/configurations/compatibility/internal/plugins.yaml
Expand Down Expand Up @@ -223,6 +229,9 @@ calicoctl:
v1.29.4:
version: v3.27.3
sha1: 24468ab467fd59727d278dfdc3a5c6eec51cdff1
v1.30.1:
version: v3.27.3
sha1: 24468ab467fd59727d278dfdc3a5c6eec51cdff1
crictl:
# crictl version is duplicated from kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml
# for backward compatibility with clusters in a private environment.
Expand Down Expand Up @@ -298,3 +307,6 @@ crictl:
v1.29.4:
version: v1.30.0
sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b
v1.30.1:
version: v1.30.0
sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b
8 changes: 8 additions & 0 deletions kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ kubernetes_versions:
supported: true
v1.29:
supported: true
v1.30:
supported: true
compatibility_map:
# This section should be changed manually.
v1.23.1:
Expand Down Expand Up @@ -161,6 +163,12 @@ compatibility_map:
kubernetes-dashboard: v2.7.0
local-path-provisioner: v0.0.26
crictl: v1.30.0
v1.30.1:
calico: v3.27.3
nginx-ingress-controller: v1.10.1
kubernetes-dashboard: v2.7.0
local-path-provisioner: v0.0.26
crictl: v1.30.0

# After any change, please run scripts/thirdparties/sync.py

Expand Down
Loading