From 5a405336aee052a4c2304aba9dd17194cb6eac4f Mon Sep 17 00:00:00 2001 From: my-git9 Date: Tue, 23 Jan 2024 00:28:09 +0800 Subject: [PATCH] Support following k8s version selection pause image (#10756) Signed-off-by: xin.li --- roles/kubespray-defaults/defaults/main/download.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 941e04da0..676989ea3 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -115,7 +115,6 @@ flannel_version: "v0.22.0" flannel_cni_version: "v1.1.2" cni_version: "v1.3.0" weave_version: 2.8.1 -pod_infra_version: "3.9" cilium_version: "v1.13.4" cilium_cli_version: "v0.15.0" @@ -133,6 +132,12 @@ skopeo_version: "v1.13.2" # 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') }}" +pod_infra_supported_versions: + v1.28: "3.9" + v1.27: "3.9" + v1.26: "3.9" +pod_infra_version: "{{ pod_infra_supported_versions[kube_major_version] }}" + etcd_supported_versions: v1.29: "v3.5.10" v1.28: "v3.5.10"