downloads: split file and containers (#13581)

Splits the definitions into two dicts, while joining then for now to
preserve the downloads dict.

Update all consumers of the variables, which are roughly:
- manual includes of the download role (which will be removed in the
  short future)
- install tasks using the resolved 'dest' to find the artefacts

This will make further division of the downloads role easier.
This commit is contained in:
Max Gautier
2026-10-13 09:58:21 +00:00
committed by GitHub
parent 40d5c77c8e
commit 1011c240b4
25 changed files with 315 additions and 376 deletions
+14 -5
View File
@@ -16,17 +16,26 @@
- download
- upload
- name: Download | Download files / images
include_tasks: "{{ include_file }}"
- name: Download | Download files
include_tasks: download_file.yml
loop: "{{ [] if skip_downloads
else
(downloads_file.values() | selectattr('enabled'))
}}"
vars:
download: "{{ download_defaults | combine(item) }}"
when:
- (download_run_once and inventory_hostname == download_delegate) or (group_names | intersect(download.groups) != [])
- name: Download | Download images
include_tasks: download_container.yml
loop: "{{ [] if (skip_downloads or not download_container)
else (
(downloads | combine(kubeadm_images)).values()
(downloads_container | combine(kubeadm_images)).values()
| selectattr('enabled')
)
}}"
vars:
download: "{{ download_defaults | combine(item) }}"
include_file: "download_{% if download.container %}container{% else %}file{% endif %}.yml"
when:
- (not download.container) or (download.container and download_container)
- (download_run_once and inventory_hostname == download_delegate) or (group_names | intersect(download.groups) != [])