From 86e99b151525cfabdf043252223c22cd3fdc8c37 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Tue, 5 Jul 2022 09:56:56 +0200
Subject: [PATCH] Install argo-cd;Housekeeping

---
 .../roles/metacluster/tasks/main.yml          | 20 ++++++++++++++-----
 .../roles/metacluster/tasks/components.yml    |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

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 387488b..cf535b2 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
@@ -106,13 +106,8 @@
             skopeo list-tags docker-archive:/data/{{ item }} | \
           jq -r '.Tags[0]')
     chdir: /opt/metacluster/container-images/
-  register: results
-#  ignore_errors: yes
   loop: "{{ imagetarballs.files }}"
 
-- ansible.builtin.debug:
-    var: results
-
 - name: Delete container image tarballs/archives
   ansible.builtin.file:
     path: /opt/metacluster/container-images
@@ -147,6 +142,21 @@
               - path: /
                 pathType: Prefix
 
+- name: Install argo-cd chart
+  kubernetes.core.helm:
+    name: argo-cd
+    chart_ref: /opt/metacluster/helm-charts/argo-cd
+    release_namespace: argo-cd
+    create_namespace: yes
+    wait: yes
+    kubeconfig: "{{ kubeconfig.path }}"
+    values:
+      server:
+        ingress:
+          enabled: true
+          hosts:
+            - gitops.{{ vapp['metacluster.fqdn'] }}
+
 - name: Cleanup tempfile
   ansible.builtin.file:
     path: "{{ kubeconfig.path }}"
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index a01e299..b73ec46 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -25,9 +25,9 @@
 - name: Inject chart values into ansible var files
   ansible.builtin.blockinfile:
     path: /opt/firstboot/ansible/vars/metacluster.yml
-    block: |2
+    block: |
       {{ item.key }}:
-        {{ item.value.helm.chart_values | default('~') }}
+        {{ item.value.helm.chart_values | default(omit) }}
     marker: "# {mark} ANSIBLE MANAGED BLOCK -- {{ item.key }}"
   loop: "{{ lookup('ansible.builtin.dict', components) }}"
   loop_control: