From f84b99f137e29e2fb589f19be0c5845ca2a2b422 Mon Sep 17 00:00:00 2001 From: mamutmk5 <3045922+mamutmk5@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:12:55 +0200 Subject: [PATCH] BC-8267 - aktivate for dev thr only the one mongo cluster for all mode (#5298) --- .../roles/common-cartridge/templates/external-secret.yml.j2 | 2 +- .../templates/moin-schule-sync-external-secret.yml.j2 | 2 +- .../templates/admin-api-server-external-secret.yml.j2 | 2 +- .../templates/amqp-files-external-secret.yml.j2 | 2 +- .../templates/external-secret-admin-api-client.yml.j2 | 2 +- .../schulcloud-server-core/templates/external-secret.yml.j2 | 6 +++--- .../templates/tldraw-server-external-secret.yml.j2 | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/roles/common-cartridge/templates/external-secret.yml.j2 b/ansible/roles/common-cartridge/templates/external-secret.yml.j2 index bfaf5b6e8d8..87a9e4541e4 100644 --- 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 index 4b21f19e0a3..3a4f49084d3 100644 --- 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 index 04bbfff6c8a..ca02a060414 100644 --- 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 index e5407113ddf..6a27af551bd 100644 --- 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 index 544edb59d6e..672c10bbe1f 100644 --- 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 index 1ddec1131d9..adcbfefdc2b 100644 --- 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 index 25626805323..2cde63bf1fb 100644 --- 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 }}