Browse Source

[download] fix dependencies for downloads

pull/8978/head
Calin Cristian Andrei 2 years ago
committed by Kubernetes Prow Robot
parent
commit
c2700266b0
5 changed files with 7 additions and 20 deletions
  1. 3
      roles/container-engine/cri-o/meta/main.yml
  2. 4
      roles/container-engine/crictl/tasks/crictl.yml
  3. 1
      roles/container-engine/crictl/tasks/main.yml
  4. 5
      roles/download/tasks/download_file.yml
  5. 14
      roles/download/tasks/main.yml

3
roles/container-engine/cri-o/meta/main.yml

@ -0,0 +1,3 @@
---
dependencies:
- role: container-engine/crictl

4
roles/container-engine/crictl/tasks/crictl.yml

@ -20,7 +20,3 @@
notify:
- Get crictl completion
- Install crictl completion
- name: Set fact crictl_installed
set_fact:
crictl_installed: true

1
roles/container-engine/crictl/tasks/main.yml

@ -1,4 +1,3 @@
---
- name: install crictĺ
include_tasks: crictl.yml
when: not crictl_installed | default(false)

5
roles/download/tasks/download_file.yml

@ -1,5 +1,9 @@
---
- block:
- name: prep_download | Set a few facts
set_fact:
download_force_cache: "{{ true if download_run_once else download_force_cache }}"
- name: download_file | Starting download of file
debug:
msg: "{{ download.url }}"
@ -31,7 +35,6 @@
become: false
when:
- download_force_cache
- download_localhost
tags:
- localhost

14
roles/download/tasks/main.yml

@ -7,20 +7,6 @@
- download
- upload
- name: install crictl
import_role:
name: container-engine/crictl
when:
- not skip_downloads|default(false)
- container_manager in ['containerd', 'crio']
- name: install nerdctl
import_role:
name: container-engine/nerdctl
when:
- not skip_downloads|default(false)
- container_manager in ['containerd']
- name: download | Get kubeadm binary and list of required images
include_tasks: prep_kubeadm_images.yml
when:

Loading…
Cancel
Save