Prevent parsing of jinja delimiters;Revert exotic syntax
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Danny Bessems 2022-07-04 15:47:24 +02:00
parent 241551169a
commit 164fd15c60
1 changed files with 12 additions and 10 deletions

View File

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