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

download container always been on download_delegate host (#5177)

Browse source 
* download container always been on download_delegate host

* fix also check pull required
This commit is contained in:
Sergey 2019-10-17 15:38:39 +03:00 committed by Kubernetes Prow Robot
parent c672681ce5
commit 65e461a7c0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/download/tasks/check_pull_required.yml
View file

@ -6,7 +6,7 @@
# nginx:1.15,gcr.io/google-containers/kube-proxy:v1.14.1,gcr.io/google-containers/kube-proxy@sha256:44af2833c6cbd9a7fc2e9d2f5244a39dfd2e31ad91bf9d4b7d810678db738ee9,gcr.io/google-containers/kube-apiserver:v1.14.1,etc... # nginx:1.15,gcr.io/google-containers/kube-proxy:v1.14.1,gcr.io/google-containers/kube-proxy@sha256:44af2833c6cbd9a7fc2e9d2f5244a39dfd2e31ad91bf9d4b7d810678db738ee9,gcr.io/google-containers/kube-apiserver:v1.14.1,etc...
- name: check_pull_required | Generate a list of information about the images on a node - name: check_pull_required | Generate a list of information about the images on a node
shell: "{{ image_info_command }}" shell: "{{ image_info_command }}"
delegate_to: "{{ download_delegate if download_run_once or inventory_hostname }}" delegate_to: "{{ download_delegate if download_run_once else inventory_hostname }}"
no_log: true no_log: true
register: docker_images register: docker_images
failed_when: false failed_when: false

6
roles/download/tasks/download_container.yml
View file

@ -54,7 +54,7 @@
- name: download_container | Load image into docker - name: download_container | Load image into docker
shell: "{{ docker_bin_dir }}/docker load < {{ image_path_cached if download_localhost else image_path_final }}" shell: "{{ docker_bin_dir }}/docker load < {{ image_path_cached if download_localhost else image_path_final }}"
delegate_to: "{{ download_delegate if download_run_once or inventory_hostname }}" delegate_to: "{{ download_delegate if download_run_once else inventory_hostname }}"
run_once: "{{ download_run_once }}" run_once: "{{ download_run_once }}"
register: container_load_status register: container_load_status
failed_when: container_load_status | failed failed_when: container_load_status | failed
@ -77,7 +77,7 @@
# if a pull is forced. This is a known issue with docker. See https://github.com/moby/moby/issues/23684 # if a pull is forced. This is a known issue with docker. See https://github.com/moby/moby/issues/23684
- name: download_container | Download image if required - name: download_container | Download image if required
command: "{{ image_pull_command }} {{ image_reponame }}" command: "{{ image_pull_command }} {{ image_reponame }}"
delegate_to: "{{ download_delegate if download_run_once or inventory_hostname }}" delegate_to: "{{ download_delegate if download_run_once else inventory_hostname }}"
delegate_facts: yes delegate_facts: yes
run_once: "{{ download_run_once }}" run_once: "{{ download_run_once }}"
register: pull_task_result register: pull_task_result
@ -100,7 +100,7 @@
- name: download_container | Save and compress image - name: download_container | Save and compress image
shell: "{{ docker_bin_dir }}/docker save {{ image_reponame }} | gzip -{{ download_compress }} > {{ image_path_cached if download_localhost else image_path_final }}" shell: "{{ docker_bin_dir }}/docker save {{ image_reponame }} | gzip -{{ download_compress }} > {{ image_path_cached if download_localhost else image_path_final }}"
delegate_to: "{{ download_delegate if download_run_once or inventory_hostname }}" delegate_to: "{{ download_delegate if download_run_once else inventory_hostname }}"
delegate_facts: no delegate_facts: no
register: container_save_status register: container_save_status
failed_when: container_save_status.stderr failed_when: container_save_status.stderr