Refine templating #3

ansible/roles/metacluster/tasks/components.yml

@@ -26,7 +26,7 @@
     path: /opt/firstboot/ansible/vars/metacluster.yml
     block: >2
         {{ item.key }}:
-          {{ item.value.helm.chart_values | default(omit) }}
+        {{ item.value.helm.chart_values | default(omit) }}
     marker: "# {mark} ANSIBLE MANAGED BLOCK -- {{ item.key }}"
   loop: "{{ lookup('ansible.builtin.dict', components) }}"
   loop_control:

ansible/vars/metacluster.yml

@@ -20,51 +20,51 @@ components:
       version: 1.3.0
       chart: longhorn/longhorn
       parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag'
-      chart_values: |
-        defaultSettings:
-          defaultDataPath: /mnt/blockstorage
-          defaultReplicaCount: 1
-        ingress:
-          enabled: true
-          host: storage.[% vapp['metacluster.fqdn'] %]
-        persistence:
-          defaultClassReplicaCount: 1
+      chart_values: |2
+          defaultSettings:
+            defaultDataPath: /mnt/blockstorage
+            defaultReplicaCount: 1
+          ingress:
+            enabled: true
+            host: storage.[% vapp['metacluster.fqdn'] %]
+          persistence:
+            defaultClassReplicaCount: 1
 
   harbor:
     helm:
       version: 1.9.1  # (= Harbor v2.5.1)
       chart: harbor/harbor
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
-      chart_values: |
-        expose:
-          ingress:
-            hosts:
-              core: registry.[% vapp['metacluster.fqdn'] %]
-        externalURL: https://registry.[% vapp['metacluster.fqdn'] %]
-        harborAdminPassword: "[% vapp['guestinfo.rootpw'] %]"
-        notary:
-          enabled: false
+      chart_values: |2
+          expose:
+            ingress:
+              hosts:
+                core: registry.[% vapp['metacluster.fqdn'] %]
+          externalURL: https://registry.[% vapp['metacluster.fqdn'] %]
+          harborAdminPassword: "[% vapp['guestinfo.rootpw'] %]"
+          notary:
+            enabled: false
 
   gitea:
     helm:
       version: v5.0.9 # (= Gitea v1.16.8)
       chart: gitea-charts/gitea
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | sed '/:/!s/$/:latest/'
-      chart_values: |
-        gitea:
-          admin:
-            username: administrator
-            password: "[% vapp['guestinfo.rootpw'] %]"
-            email: admin@[% vapp['metacluster.fqdn'] %]
-        image:
-          pullPolicy: IfNotPresent
-        ingress:
-          enabled: true
-          hosts:
-            - host: git.[% vapp['metacluster.fqdn'] %]
-              paths:
-                - path: /
-                  pathType: Prefix
+      chart_values: |2
+          gitea:
+            admin:
+              username: administrator
+              password: "[% vapp['guestinfo.rootpw'] %]"
+              email: admin@[% vapp['metacluster.fqdn'] %]
+          image:
+            pullPolicy: IfNotPresent
+          ingress:
+            enabled: true
+            hosts:
+              - host: git.[% vapp['metacluster.fqdn'] %]
+                paths:
+                  - path: /
+                    pathType: Prefix
 
   argo-cd:
     helm: