Skip to content

Commit

Permalink
[download] fix dependencies for downloads
Browse files Browse the repository at this point in the history
  • Loading branch information
cristicalin committed Jun 13, 2022
1 parent d37b19d commit d01b181
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 20 deletions.
3 changes: 3 additions & 0 deletions roles/container-engine/cri-o/meta/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
dependencies:
- role: container-engine/crictl
4 changes: 0 additions & 4 deletions roles/container-engine/crictl/tasks/crictl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,3 @@
notify:
- Get crictl completion
- Install crictl completion

- name: Set fact crictl_installed
set_fact:
crictl_installed: true
1 change: 0 additions & 1 deletion roles/container-engine/crictl/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
- name: install crictĺ
include_tasks: crictl.yml
when: not crictl_installed | default(false)
5 changes: 4 additions & 1 deletion roles/download/tasks/download_file.yml
Original file line number Diff line number Diff line change
@@ -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 }}"
Expand Down Expand Up @@ -31,7 +35,6 @@
become: false
when:
- download_force_cache
- download_localhost
tags:
- localhost

Expand Down
14 changes: 0 additions & 14 deletions roles/download/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit d01b181

Please sign in to comment.