From 51bd9bee0d30e63155bedf2f7afcdfdd54becf92 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Sun, 9 Jan 2022 01:47:12 -0800 Subject: [PATCH] Move containerd_version to defaults/main.yml (#8379) All container image versions were defined in download/defaults/main.yml except containerd. The inconsistency caused the offline script(generate_list.sh) could not output the URL of containerd image. This moves the definition into a valid file. In addition, this adds host_os to generate_list.sh for downloading krew from a valid URL. --- contrib/offline/generate_list.sh | 1 + roles/download/defaults/main.yml | 4 ++++ roles/kubespray-defaults/defaults/main.yaml | 4 ---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/offline/generate_list.sh b/contrib/offline/generate_list.sh index 7d77d8135..b481e1860 100644 --- a/contrib/offline/generate_list.sh +++ b/contrib/offline/generate_list.sh @@ -21,6 +21,7 @@ arch=${ARCH} image_arch=${IMAGE_ARCH} ansible_system=${ANSIBLE_SYSTEM} ansible_architecture=${ANSIBLE_ARCHITECTURE} +host_os=${ANSIBLE_SYSTEM} EOF # generate all component version by $DOWNLOAD_YML diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index df359feae..64e5da159 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -58,6 +58,10 @@ crun_version: 1.4 runc_version: v1.0.3 kata_containers_version: 2.2.3 gvisor_version: 20210921 +containerd_version: 1.5.8 + +# this is relevant when container_manager == 'docker' +docker_containerd_version: 1.4.12 # gcr and kubernetes image repo define gcr_image_repo: "gcr.io" diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 556766a16..4cb219799 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -344,12 +344,8 @@ docker_plugins: [] etcd_kubeadm_enabled: false # Containerd options - thse are relevant when container_manager == 'containerd' -containerd_version: 1.5.8 containerd_use_systemd_cgroup: true -# Docker options - this is relevant when container_manager == 'docker' -docker_containerd_version: 1.4.12 - ## An obvious use case is allowing insecure-registry access to self hosted registries. ## Can be ipaddress and domain_name. ## example define mirror.registry.io or 172.19.16.11:5000