From b50e4c9eb77316d77e91eaabfb3979c5c60440be Mon Sep 17 00:00:00 2001 From: ERIK Date: Mon, 22 Jan 2024 23:20:03 +0800 Subject: [PATCH] Fix hardcoded pod infra version (#10804) Signed-off-by: bo.jiang --- roles/download/defaults/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index d69cc1c88..95cdd3b65 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -114,7 +114,6 @@ flannel_version: "v0.20.2" flannel_cni_version: "v1.2.0" cni_version: "v1.2.0" weave_version: 2.8.1 -pod_infra_version: "3.8" cilium_version: "v1.12.1" cilium_cli_version: "v0.12.5" @@ -132,6 +131,12 @@ skopeo_version: v1.10.0 # 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_version: + v1.25: "3.8" + v1.24: "3.7" + v1.23: "3.6" +pod_infra_version: "{{ pod_infra_supported_version[kube_major_version] }}" + etcd_supported_versions: v1.25: "v3.5.6" v1.24: "v3.5.6"