From 6c4fe7a0e61097a883833abcd9b2a4121e2268d4 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Wed, 31 Aug 2022 12:04:53 +0200
Subject: [PATCH] Improve feedback;Fix Gitea config;Fix argocd config

---
 .../ansible_payload/roles/metacluster/tasks/registry.yml | 2 ++
 .../files/ansible_payload/templates/applicationset.j2    | 6 +++---
 ansible/vars/metacluster.yml                             | 9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
index 4b671c2..cafd4b4 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
@@ -23,6 +23,8 @@
           jq -r '.Tags[0]')
     chdir: /opt/metacluster/container-images/
   with_fileglob: /opt/metacluster/container-images/*.tar
+  loop_control:
+    label: "{{ item | basename }}"
 
 - name: Configure K3s node for private registry
   ansible.builtin.template:
diff --git a/ansible/roles/firstboot/files/ansible_payload/templates/applicationset.j2 b/ansible/roles/firstboot/files/ansible_payload/templates/applicationset.j2
index 27a4988..63303a8 100644
--- a/ansible/roles/firstboot/files/ansible_payload/templates/applicationset.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/templates/applicationset.j2
@@ -6,7 +6,7 @@ metadata:
 spec:
   generators:
   - git:
-      repoURL: https://git.{{ vapp['metacluster.fqdn'] }}/mc/ArgoCD.Config.git
+      repoURL: ssh://git@gitea-ssh.gitea.svc.cluster.local/mc/GitOps.Config.git
       revision: HEAD
       directories:
       - path: metacluster-applicationset/*
@@ -20,9 +20,9 @@ spec:
           prune: true
           selfHeal: true
       source:
-        repoURL: https://git.{{ vapp['metacluster.fqdn'] }}/mc/ArgoCD.Config.git
+        repoURL: ssh://git@gitea-ssh.gitea.svc.cluster.local/mc/GitOps.Config.git
         targetRevision: HEAD
         path: {% raw %}'{{ path }}'{% endraw +%}
       destination:
-        server: https://{{ vapp['guestinfo.ipaddress'] }}:6443
+        server: https://kubernetes.default.svc
         namespace: default
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index 6a3ad5b..ac9dbbb 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -116,15 +116,16 @@ components:
       chart: gitea-charts/gitea
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | sed '/:/!s/$/:latest/'
       chart_values: !unsafe |
-        config:
-          offlineMode: true
-          server:
-            PROTOCOL: https
         gitea:
           admin:
             username: administrator
             password: "{{ vapp['guestinfo.rootpw'] }}"
             email: admin@{{ vapp['metacluster.fqdn'] }}
+          config:
+            server:
+              OFFLINE_MODE: true
+              PROTOCOL: http
+              ROOT_URL: https://git.{{ vapp['metacluster.fqdn'] }}/
         image:
           pullPolicy: IfNotPresent
         ingress: