From 05b30287bda1e67260583438d6931dab2b4b7557 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Fri, 15 Jul 2022 14:02:27 +0200
Subject: [PATCH] Fix label;Configure gitea SSH;Fix git folder

---
 ansible/roles/metacluster/tasks/components.yml | 5 ++---
 ansible/roles/metacluster/tasks/config.yml     | 4 ++--
 ansible/vars/metacluster.yml                   | 8 +++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 8141160..9f16683 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -62,10 +62,9 @@
     owner: root
     group: root
     mode: 0600
-  when: item is defined
-  loop: "{{ lookup('ansible.builtin.dict', components) | map(attribute='value.manifests') | list }}"
+  loop: "{{ lookup('ansible.builtin.dict', components) | map(attribute='value.manifests') | list | select('defined') }}"
   loop_control:
-    label: "{{ item.key }}"
+    label: "{{ item.type + '/' + item.name }}"
 
 - name: Compress tarballs
   community.general.archive:
diff --git a/ansible/roles/metacluster/tasks/config.yml b/ansible/roles/metacluster/tasks/config.yml
index 06df4cc..b48d32e 100644
--- a/ansible/roles/metacluster/tasks/config.yml
+++ b/ansible/roles/metacluster/tasks/config.yml
@@ -3,9 +3,9 @@
     path: "{{ item }}"
     state: directory
   loop:
-    - /opt/metacluster/git-repositories
+    - /opt/metacluster/git-repositories/gitops
 
 - name: Clone git repository
   ansible.builtin.git:
     repo: https://code.spamasaurus.com/djpbessems/GitOps.MetaCluster.git
-    dest: /opt/metacluster/git-repositories
+    dest: /opt/metacluster/git-repositories/gitops
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index e52c795..d218c29 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -7,9 +7,6 @@ platform:
     - name: traefik
       namespace: kube-system
       config: |2
-            # ingressRoute:
-            #   dashboard:
-            #     enabled: true
             ports:
               ssh:
                 port: 8022
@@ -83,6 +80,11 @@ components:
               paths:
                 - path: /
                   pathType: Prefix
+        service:
+          ssh:
+            type: ClusterIP
+            port: 22
+            clusterIP:
     manifests:
       - type: ingressroutetcp
         name: gitea-ssh