From f03e0c3bda1235510bbb75a3a28f8487f68cc7d4 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Mon, 2 Jan 2023 09:13:56 +0100 Subject: [PATCH] Copy kubeadm images to separate project --- .../roles/workloadcluster/tasks/.note | 2 +- .../roles/workloadcluster/tasks/main.yml | 1 + .../roles/workloadcluster/tasks/registry.yml | 18 +++++++++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/.note b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/.note index 3a22956..dfaa60a 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/.note +++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/.note @@ -1,5 +1,5 @@ clusterConfiguration: - imageRepository: registry./library + imageRepository: registry./kubeadm files: - [...] diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml index 9d0f87c..a6937a4 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml @@ -1,3 +1,4 @@ - import_tasks: hypervisor.yml +- import_tasks: registry.yml - import_tasks: clusterapi.yml - import_tasks: nodetemplates.yml diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/registry.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/registry.yml index 162af5d..fade1d0 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/registry.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/registry.yml @@ -23,15 +23,15 @@ ansible.builtin.set_fact: kubeadm_images: "{{ lookup('ansible.builtin.file', '/opt/metacluster/cluster-api/imagelist').splitlines() }}" - # - name: Copy all stored rancher container images to dedicated project - # ansible.builtin.uri: - # url: https://registry.{{ vapp['metacluster.fqdn'] }}/api/v2.0/projects/kubeadm/repositories/{{ ( item | regex_findall('([^:/]+)') )[-2] }}/artifacts?from={{ item | replace('/', '%2F') | replace(':', '%3A') }} - # method: POST - # headers: - # Authorization: "Basic {{ ('admin:' + vapp['metacluster.password']) | b64encode }}" - # body: - # from: "{{ item }}" - # loop: "{{ kubeadm_images }}" + - name: Copy all stored rancher container images to dedicated project + ansible.builtin.uri: + url: https://registry.{{ vapp['metacluster.fqdn'] }}/api/v2.0/projects/kubeadm/repositories/{{ ( item | regex_findall('([^:/]+)') )[-2] }}/artifacts?from=library/{{ item | replace('/', '%2F') | replace(':', '%3A') }} + method: POST + headers: + Authorization: "Basic {{ ('admin:' + vapp['metacluster.password']) | b64encode }}" + body: + from: "{{ item }}" + loop: "{{ kubeadm_images }}" module_defaults: ansible.builtin.uri: