Merge branch 'main' into EW-1005

hpi-schul-cloud · Oct 17, 2024 · b94dc5c · b94dc5c
2 parents 5868d14 + f84b99f
commit b94dc5c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/ansible/roles/common-cartridge/templates/external-secret.yml.j2 b/ansible/roles/common-cartridge/templates/external-secret.yml.j2
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
+        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: common-cartridge-secret{{ EXTERNAL_SECRETS_POSTFIX }}

diff --git a/ansible/roles/moin-schule-sync/templates/moin-schule-sync-external-secret.yml.j2 b/ansible/roles/moin-schule-sync/templates/moin-schule-sync-external-secret.yml.j2
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
+        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: moin-schule-sync-secret{{ EXTERNAL_SECRETS_POSTFIX }}

diff --git a/ansible/roles/schulcloud-server-core/templates/admin-api-server-external-secret.yml.j2 b/ansible/roles/schulcloud-server-core/templates/admin-api-server-external-secret.yml.j2
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
+        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: admin-api-server-secret{{ EXTERNAL_SECRETS_POSTFIX }}

diff --git a/ansible/roles/schulcloud-server-core/templates/amqp-files-external-secret.yml.j2 b/ansible/roles/schulcloud-server-core/templates/amqp-files-external-secret.yml.j2
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
+        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: amqp-files-secret{{ EXTERNAL_SECRETS_POSTFIX }}

diff --git a/ansible/roles/schulcloud-server-core/templates/external-secret-admin-api-client.yml.j2 b/ansible/roles/schulcloud-server-core/templates/external-secret-admin-api-client.yml.j2
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
+        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: admin-api-client-secret{{ EXTERNAL_SECRETS_POSTFIX }}

diff --git a/ansible/roles/schulcloud-server-core/templates/external-secret.yml.j2 b/ansible/roles/schulcloud-server-core/templates/external-secret.yml.j2
@@ -16,9 +16,9 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
-        DATABASE__URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' }}"
-        TLDRAW_DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'tldraw' }}"
+        DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
+        DATABASE__URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
+        TLDRAW_DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'tldraw' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: api-secret{{ EXTERNAL_SECRETS_POSTFIX }}

diff --git a/ansible/roles/schulcloud-server-core/templates/tldraw-server-external-secret.yml.j2 b/ansible/roles/schulcloud-server-core/templates/tldraw-server-external-secret.yml.j2
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        TLDRAW_DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'tldraw' }}"
+        TLDRAW_DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'tldraw' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: tldraw-server-secret{{ EXTERNAL_SECRETS_POSTFIX }}