From eeb1364f1bb4100194c437e414d16f3ce042e1ea Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Mon, 11 Jul 2022 09:56:02 +0200
Subject: [PATCH] Refactor templating #3

---
 ansible/vars/metacluster.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index 25d8a23..2532e72 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -20,8 +20,7 @@ components:
       version: 1.3.0
       chart: longhorn/longhorn
       parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag'
-      chart_values: |
-        {% raw %}
+      chart_values: !unsafe |
         defaultSettings:
           defaultDataPath: /mnt/blockstorage
           defaultReplicaCount: 1
@@ -30,15 +29,13 @@ components:
           host: storage.{{ vapp['metacluster.fqdn'] }}
         persistence:
           defaultClassReplicaCount: 1
-        {% endraw %}
 
   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: |
-        {% raw %}
+      chart_values: !unsafe |
         expose:
           ingress:
             hosts:
@@ -47,15 +44,13 @@ components:
         harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}"
         notary:
           enabled: false
-        {% endraw %}
 
   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: |
-        {% raw %}
+      chart_values: !unsafe |
         gitea:
           admin:
             username: administrator
@@ -70,15 +65,13 @@ components:
               paths:
                 - path: /
                   pathType: Prefix
-        {% endraw %}
 
   argo-cd:
     helm:
       version: 4.9.7  # (= ArgoCD v2.4.2)
       chart: argo/argo-cd
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
-      chart_values: |
-        {% raw %}
+      chart_values: !unsafe |
         server:
           extraArgs:
             - --insecure
@@ -89,7 +82,6 @@ components:
         configs:
           secret:
             argocdServerAdminPassword: "{{ vapp['guestinfo.rootpw'] | password_hash('bcrypt') }}"
-        {% endraw %}
 
 dependencies: