From 8ed9b2f754b6fb0c51b914bcbbd09f1ff23d5365 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Mon, 27 Jun 2022 08:44:16 +0200
Subject: [PATCH] Fix firstboot logic;Refactor helm chart parsing;Housekeeping

---
 ansible/roles/appliance/tasks/dependencies.yml       | 12 ++++++------
 .../ansible_payload/roles/metacluster/tasks/main.yml |  2 +-
 ansible/roles/metacluster/tasks/components.yml       |  4 ++--
 ansible/roles/metacluster/tasks/k3s.yml              |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/appliance/tasks/dependencies.yml b/ansible/roles/appliance/tasks/dependencies.yml
index f7ecc56..2d9f04f 100644
--- a/ansible/roles/appliance/tasks/dependencies.yml
+++ b/ansible/roles/appliance/tasks/dependencies.yml
@@ -1,9 +1,9 @@
-- name: Create folder structure(s)
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-  loop:
-    - /opt/metacluster/dependencies/helm/charts
+# - name: Create folder structure(s)
+#  ansible.builtin.file:
+#    path: "{{ item }}"
+#    state: directory
+#  loop:
+#    - /foo
 
 - name: Download & install static binaries
   ansible.builtin.get_url:
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
index 7e4abdc..21368b0 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: Install K3s
   ansible.builtin.command:
     cmd: ./install.sh
-    chdir: /opt/metacluster/xxx
+    chdir: /opt/metacluster/k3s
   environment:
     INSTALL_K3S_SKIP_DOWNLOAD: 'true'
     INSTALL_K3S_EXEC: 'server --cluster-init'
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 32c0848..f4a8be6 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -3,7 +3,6 @@
     path: "{{ item }}"
     state: directory
   loop:
-    - /opt/metacluster/components/harbor
     - /opt/metacluster/helm-charts
     - /opt/metacluster/container-images
 
@@ -24,7 +23,8 @@
 
 - name: Parse helm charts for container images
   ansible.builtin.command:
-    cmd: "{{ item.value.helm.parse_logic }} /opt/metacluster/helm-charts/{{ item.key }}/values.yaml"
+    cmd: helm template . | yq e '.. | .image? | select(.)' -N | sort -u
+    chdir: /opt/metacluster/helm-charts/{{ item.key }}
   register: containerimages
   loop: "{{ lookup('ansible.builtin.dict', components) }}"
   loop_control:
diff --git a/ansible/roles/metacluster/tasks/k3s.yml b/ansible/roles/metacluster/tasks/k3s.yml
index 6756db5..d94e009 100644
--- a/ansible/roles/metacluster/tasks/k3s.yml
+++ b/ansible/roles/metacluster/tasks/k3s.yml
@@ -22,7 +22,7 @@
 - name: Download K3s install script
   ansible.builtin.get_url:
     url: https://get.k3s.io
-    dest: /opt/metacluster/k3s
+    dest: /opt/metacluster/k3s/install.sh
     owner: root
     group: root
     mode: 0755