C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move containerd_version to defaults/main.yml (#8379)

Browse source 
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.
This commit is contained in:
Kenichi Omichi 2022-01-09 01:47:12 -08:00 committed by GitHub
parent 52266406f8
commit 51bd9bee0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/offline/generate_list.sh
View file

@ -21,6 +21,7 @@ arch=${ARCH}
image_arch=${IMAGE_ARCH} image_arch=${IMAGE_ARCH}
ansible_system=${ANSIBLE_SYSTEM} ansible_system=${ANSIBLE_SYSTEM}
ansible_architecture=${ANSIBLE_ARCHITECTURE} ansible_architecture=${ANSIBLE_ARCHITECTURE}
host_os=${ANSIBLE_SYSTEM}
EOF EOF
# generate all component version by $DOWNLOAD_YML # generate all component version by $DOWNLOAD_YML

4
roles/download/defaults/main.yml
View file

@ -58,6 +58,10 @@ crun_version: 1.4
runc_version: v1.0.3 runc_version: v1.0.3
kata_containers_version: 2.2.3 kata_containers_version: 2.2.3
gvisor_version: 20210921 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 and kubernetes image repo define
gcr_image_repo: "gcr.io" gcr_image_repo: "gcr.io"

4
roles/kubespray-defaults/defaults/main.yaml
View file

@ -344,12 +344,8 @@ docker_plugins: []
etcd_kubeadm_enabled: false etcd_kubeadm_enabled: false
# Containerd options - thse are relevant when container_manager == 'containerd' # Containerd options - thse are relevant when container_manager == 'containerd'
containerd_version: 1.5.8
containerd_use_systemd_cgroup: true 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. ## An obvious use case is allowing insecure-registry access to self hosted registries.
## Can be ipaddress and domain_name. ## Can be ipaddress and domain_name.
## example define mirror.registry.io or 172.19.16.11:5000 ## example define mirror.registry.io or 172.19.16.11:5000