Refine templating #5

ansible/roles/metacluster/tasks/components.yml

@@ -25,7 +25,7 @@
 
     - name: Aggregate chart_values into dict
       ansible.builtin.set_fact:
-        chart_values: "{{ chart_values | default({}) | combine({ item.key: (item.value.helm.chart_values | default('~')) }) }}"
+        chart_values: "{{ chart_values | default({}) | combine({ item.key: { 'chart_values': (item.value.helm.chart_values | default('~')) } }) }}"
       loop: "{{ lookup('ansible.builtin.dict', components) }}"
       loop_control:
         label: "{{ item.key }}"

ansible/vars/metacluster.yml

@@ -20,7 +20,7 @@ components:
       version: 1.3.0
       chart: longhorn/longhorn
       parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag'
-      chart_values: |4
+      chart_values:
         defaultSettings:
           defaultDataPath: /mnt/blockstorage
           defaultReplicaCount: 1
@@ -35,7 +35,7 @@ components:
       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: |4
+      chart_values:
         expose:
           ingress:
             hosts:
@@ -50,7 +50,7 @@ components:
       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: |4
+      chart_values:
         gitea:
           admin:
             username: administrator