Fix hardcoded pod infra version

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
pull/10878/head
bo.jiang 2024-01-18 10:27:41 +08:00 committed by Florian Ruynat
parent a0c142f2e7
commit d8a8fb03a2
1 changed files with 6 additions and 1 deletions

View File

@ -117,7 +117,6 @@ flannel_version: "v0.21.4"
flannel_cni_version: "v1.2.0" flannel_cni_version: "v1.2.0"
cni_version: "v1.3.0" cni_version: "v1.3.0"
weave_version: 2.8.1 weave_version: 2.8.1
pod_infra_version: "3.9"
cilium_version: "v1.13.0" cilium_version: "v1.13.0"
cilium_cli_version: "v0.13.1" cilium_cli_version: "v0.13.1"
@ -135,6 +134,12 @@ skopeo_version: v1.10.0
# Get kubernetes major version (i.e. 1.17.4 => 1.17) # Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}" kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"
pod_infra_supported_version:
v1.26: "3.9"
v1.25: "3.8"
v1.24: "3.7"
pod_infra_version: "{{ pod_infra_supported_version[kube_major_version] }}"
etcd_supported_versions: etcd_supported_versions:
v1.26: "v3.5.6" v1.26: "v3.5.6"
v1.25: "v3.5.6" v1.25: "v3.5.6"