Skip to content

Commit 5d659ff

Browse files
Adrià Garriga-Alonsocollijk
authored andcommitted
Use containerd_snapshotter everywhere that we should
1 parent a20891a commit 5d659ff

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

roles/container-engine/nerdctl/templates/nerdctl.toml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ debug = false
22
debug_full = false
33
address = "{{ cri_socket }}"
44
namespace = "k8s.io"
5-
snapshotter = "{{ nerdctl_snapshotter | default('overlayfs') }}"
5+
snapshotter = "{{ containerd_snapshotter | default('overlayfs') }}"
66
cni_path = "/opt/cni/bin"
77
cni_netconfpath = "/etc/cni/net.d"
88
cgroup_manager = "{{ kubelet_cgroup_driver | default('systemd') }}"

roles/download/tasks/set_container_facts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
- name: Set image save/load command for containerd on localhost
4848
set_fact:
49-
image_save_command_on_localhost: "{{ containerd_bin_dir }}/ctr -n k8s.io image export --platform linux/{{ image_arch }} {{ image_path_cached }} {{ image_reponame }}"
49+
image_save_command_on_localhost: "{{ containerd_bin_dir }}/ctr -n k8s.io image export --snapshotter={{ containerd_snapshotter }} --platform linux/{{ image_arch }} {{ image_path_cached }} {{ image_reponame }}"
5050
when: container_manager_on_localhost == 'containerd'
5151

5252
- name: Set image save/load command for crio on localhost

roles/kubespray_defaults/defaults/main/download.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ download_retries: 4
5757
docker_image_pull_command: "{{ docker_bin_dir }}/docker pull"
5858
docker_image_info_command: "{{ docker_bin_dir }}/docker images -q | xargs -i {{ '{{' }} docker_bin_dir }}/docker inspect -f {% raw %}'{{ '{{' }} if .RepoTags }}{{ '{{' }} join .RepoTags \",\" }}{{ '{{' }} end }}{{ '{{' }} if .RepoDigests }},{{ '{{' }} join .RepoDigests \",\" }}{{ '{{' }} end }}' {% endraw %} {} | tr '\n' ','"
5959
nerdctl_image_info_command: "{{ bin_dir }}/nerdctl -n k8s.io images --format '{% raw %}{{ .Repository }}:{{ .Tag }}{% endraw %}' 2>/dev/null | grep -v ^:$ | tr '\n' ','"
60-
nerdctl_image_pull_command: "{{ bin_dir }}/nerdctl -n k8s.io pull --quiet"
60+
nerdctl_image_pull_command: "{{ bin_dir }}/nerdctl -n k8s.io pull --quiet --snapshotter={{ containerd_snapshotter }}"
6161
crictl_image_info_command: "{{ bin_dir }}/crictl images --verbose | awk -F ': ' '/RepoTags|RepoDigests/ {print $2}' | tr '\n' ','"
6262
crictl_image_pull_command: "{{ bin_dir }}/crictl pull"
6363

0 commit comments

Comments
 (0)