Different syntax to allow raw jinja strings

Fix quotes
Fix linting error
2022-07-04 15:12:27 +02:00 · 2022-07-04 14:55:07 +02:00 · 2022-07-04 14:15:08 +02:00
4 changed files with 10 additions and 12 deletions
--- a/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2
@@ -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"
--- a/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
@@ -1,2 +1 @@
 components:
-
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -6,7 +6,6 @@
    - /opt/metacluster/helm-charts
    - /opt/metacluster/container-images

-#- name: Inject values (re: firstboot logic)

 - name: Add helm repositories
  kubernetes.core.helm_repository:
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -26,7 +26,7 @@ components:
          defaultReplicaCount: 1
        ingress:
          enabled: true
-          host: storage.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %}
+          host: storage.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
        persistence:
          defaultClassReplicaCount: 1

@@ -39,9 +39,9 @@ components:
        expose:
          ingress:
            hosts:
-              core: registry.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %}
-        externalURL: https://registry.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %}
-        harborAdminPassword: "{% raw %}{{ vapp['guestinfo.rootpw'] }}{% endraw %}"
+              core: registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
+        externalURL: https://registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
+        harborAdminPassword: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}"
        notary:
          enabled: false

@@ -54,13 +54,13 @@ components:
        gitea:
          admin:
            username: administrator
-            password: "{% raw %}{{ vapp['guestinfo.rootpw'] }}{% endraw %}"
-            email: admin@{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %}
+            password: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}"
+            email: admin@{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
        image:
          pullPolicy: IfNotPresent
        ingress:
          hosts:
-            - host: git.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %}
+            - host: git.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
              paths:
                - path: /
                  pathType: Prefix
Author	SHA1	Message	Date
Danny Bessems	fe8765ded7	Different syntax to allow raw jinja strings Some checks failed 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