kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

download run once feature for containerd (#6997)

pull/7002/head
Sergey 2020-12-07 12:09:25 +03:00 committed by GitHub
parent 878fe80ca3
commit a69f2b09da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/download/tasks/set_container_facts.yml
View File

@ -26,9 +26,9 @@
set_fact: set_fact:
image_save_command: "{{ containerd_bin_dir }}/ctr -n k8s.io image export {{ image_path_final }} {{ image_reponame }}" image_save_command: "{{ containerd_bin_dir }}/ctr -n k8s.io image export {{ image_path_final }} {{ image_reponame }}"
image_load_command: "{{ containerd_bin_dir }}/ctr -n k8s.io image import --base-name {{ download.repo }} {{ image_path_final }}" image_load_command: "{{ containerd_bin_dir }}/ctr -n k8s.io image import --base-name {{ download.repo }} {{ image_path_final }}"
when: container_manager in ['crio' ,'containerd'] when: container_manager == 'containerd'
- name: Set image save/load command for containerd and crio on localhost - name: Set image save/load command for containerd and crio on localhost
set_fact: set_fact:
image_save_command_on_localhost: "{{ containerd_bin_dir }}/ctr -n k8s.io image export {{ image_path_cached }} {{ image_reponame }}" image_save_command_on_localhost: "{{ containerd_bin_dir }}/ctr -n k8s.io image export {{ image_path_cached }} {{ image_reponame }}"
when: container_manager_on_localhost in ['crio' ,'containerd'] when: container_manager_on_localhost == 'containerd'

4
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
View File

@ -282,8 +282,8 @@
- name: Stop if download_localhost is enabled when container_manager not docker - name: Stop if download_localhost is enabled when container_manager not docker
assert: assert:
that: container_manager == 'docker' that: container_manager in ['containerd', 'docker']
msg: "download_run_once support only for docker. See https://github.com/containerd/containerd/issues/4075 for details" msg: "download_run_once support only for docker or containerd"
when: download_run_once or download_force_cache when: download_run_once or download_force_cache
- name: Stop if kata_containers_enabled is enabled when container_manager is docker - name: Stop if kata_containers_enabled is enabled when container_manager is docker

2
tests/files/packet_centos7-flannel-containerd-addons-ha.yml
View File

@ -7,6 +7,8 @@ mode: ha
kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085 kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
kube_proxy_mode: iptables kube_proxy_mode: iptables
kube_network_plugin: flannel kube_network_plugin: flannel
download_localhost: false
download_run_once: true
helm_enabled: true helm_enabled: true
kubernetes_audit: true kubernetes_audit: true
container_manager: containerd container_manager: containerd