Compare commits

..

No commits in common. "fe8765ded79f0d6d09d65401d87d077ea6bad09c" and "9458f497449f2929d9fd1aa14f914f24c0afd378" have entirely different histories.

4 changed files with 12 additions and 10 deletions

View File

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

View File

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

View File

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