epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-13 21:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use last patch versions by default for etcd/crio/crictl (#12233)

Browse Source 
This uses the same logic than the other versions, with simplications for
crictl and crio whose versionning scheme is tied to upstream kubernetes.

Also move some version variables in vars/ rather than defaults/, because
they are not used elsewhere and don't really make sense as modifiable by
the user.
This commit is contained in:
Max Gautier
2025-06-15 01:56:55 +00:00
committed by GitHub
parent f77aea13e9
commit 144742cbce
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
roles/kubespray_defaults/defaults/main/download.yml
View File

@@ -124,32 +124,10 @@ helm_version: "{{ (helm_archive_checksums['amd64'] | dict2items)[0].key }}"
nerdctl_version: "{{ (nerdctl_archive_checksums['amd64'] | dict2items)[0].key }}"
skopeo_version: "{{ (skopeo_binary_checksums['amd64'] | dict2items)[0].key }}"
# Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ (kube_version | split('.'))[:-1] | join('.') }}"
pod_infra_supported_versions:
'1.33': '3.10'
'1.32': '3.10'
'1.31': '3.10'
pod_infra_version: "{{ pod_infra_supported_versions[kube_major_version] }}"
etcd_supported_versions:
'1.33': 3.5.21
'1.32': 3.5.16
'1.31': 3.5.16
etcd_version: "{{ etcd_supported_versions[kube_major_version] }}"
crictl_supported_versions:
'1.33': 1.33.0
'1.32': 1.32.0
'1.31': 1.31.1
crictl_version: "{{ crictl_supported_versions[kube_major_version] }}"
crio_supported_versions:
'1.33': 1.33.0
'1.32': 1.32.0
'1.31': 1.31.3
crio_version: "{{ crio_supported_versions[kube_major_version] }}"
crictl_version: "{{ (crictl_checksums['amd64'].keys() | select('version', kube_major_next_version, '<'))[0] }}"
crio_version: "{{ (crio_archive_checksums['amd64'].keys() | select('version', kube_major_next_version, '<'))[0] }}"
# Scheduler plugins doesn't build for K8s 1.29 yet
scheduler_plugins_supported_versions:

16
roles/kubespray_defaults/vars/main/main.yml
View File

@@ -1,4 +1,20 @@
---
# Internal version manipulation tooling
# Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ (kube_version | split('.'))[:-1] | join('.') }}"
kube_next: "{{ ((kube_version | split('.'))[1] | int) + 1 }}"
kube_major_next_version: "1.{{ kube_next }}"
pod_infra_supported_versions:
'1.33': '3.10'
'1.32': '3.10'
'1.31': '3.10'
etcd_supported_versions:
'1.33': "{{ (etcd_binary_checksums['amd64'].keys() | select('version', '3.6', '<'))[0] }}"
'1.32': "{{ (etcd_binary_checksums['amd64'].keys() | select('version', '3.6', '<'))[0] }}"
'1.31': "{{ (etcd_binary_checksums['amd64'].keys() | select('version', '3.6', '<'))[0] }}"
# Kubespray constants
kube_proxy_deployed: "{{ 'addon/kube-proxy' not in kubeadm_init_phases_skip }}"