Compare commits

...

3 Commits

Author SHA1 Message Date
Danny Bessems fe8765ded7 Different syntax to allow raw jinja strings
continuous-integration/drone/push Build is failing Details
2022-07-04 15:12:27 +02:00
Danny Bessems caf45b5270 Fix quotes 2022-07-04 14:55:07 +02:00
Danny Bessems 9ba2df08cd Fix linting error 2022-07-04 14:15:08 +02:00
4 changed files with 10 additions and 12 deletions

View File

@ -1,16 +1,16 @@
mirrors: mirrors:
docker.io: docker.io:
endpoint: endpoint:
- "https://registry.{{ vapp['metacluster.fqdn'] }} - https://registry.{{ vapp['metacluster.fqdn'] }}
rewrite: rewrite:
"(.*)": "library/docker.io/$1" "(.*)": "library/docker.io/$1"
ghcr.io: ghcr.io:
endpoint: endpoint:
- "https://registry.{{ vapp['metacluster.fqdn'] }} - https://registry.{{ vapp['metacluster.fqdn'] }}
rewrite: rewrite:
"(.*)": "library/ghcr.io/$1" "(.*)": "library/ghcr.io/$1"
quay.io: quay.io:
endpoint: endpoint:
- "https://registry.{{ vapp['metacluster.fqdn'] }} - https://registry.{{ vapp['metacluster.fqdn'] }}
rewrite: rewrite:
"(.*)": "library/quay.io/$1" "(.*)": "library/quay.io/$1"

View File

@ -1,2 +1 @@
components: components:

View File

@ -6,7 +6,6 @@
- /opt/metacluster/helm-charts - /opt/metacluster/helm-charts
- /opt/metacluster/container-images - /opt/metacluster/container-images
#- name: Inject values (re: firstboot logic)
- name: Add helm repositories - name: Add helm repositories
kubernetes.core.helm_repository: kubernetes.core.helm_repository:

View File

@ -26,7 +26,7 @@ components:
defaultReplicaCount: 1 defaultReplicaCount: 1
ingress: ingress:
enabled: true enabled: true
host: storage.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} host: storage.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
persistence: persistence:
defaultClassReplicaCount: 1 defaultClassReplicaCount: 1
@ -39,9 +39,9 @@ components:
expose: expose:
ingress: ingress:
hosts: hosts:
core: registry.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} core: registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
externalURL: https://registry.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} externalURL: https://registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
harborAdminPassword: "{% raw %}{{ vapp['guestinfo.rootpw'] }}{% endraw %}" harborAdminPassword: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}"
notary: notary:
enabled: false enabled: false
@ -54,13 +54,13 @@ components:
gitea: gitea:
admin: admin:
username: administrator username: administrator
password: "{% raw %}{{ vapp['guestinfo.rootpw'] }}{% endraw %}" password: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}"
email: admin@{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} email: admin@{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
image: image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
ingress: ingress:
hosts: hosts:
- host: git.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} - host: git.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
paths: paths:
- path: / - path: /
pathType: Prefix pathType: Prefix