From a0fe98e1562e5e648d7dc37638bf3026264f0ae9 Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Fri, 23 Aug 2024 13:53:10 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5(helm)=20configure=20staging=20to?= =?UTF-8?q?=20use=20scaleway=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change staging configuration to use scaleway transactionnal email --- CHANGELOG.md | 1 + secrets | 2 +- .../env.d/preprod/values.impress.yaml.gotmpl | 16 ++++++++++++---- .../env.d/production/values.impress.yaml.gotmpl | 16 ++++++++++++---- .../env.d/staging/values.impress.yaml.gotmpl | 16 ++++++++++++---- src/helm/extra/templates/secrets.yaml | 6 ++++++ 6 files changed, 44 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f12d833b..fb14b2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to ## Changed - ♻️ Change ordering docs datagrid #195 +- 🔥(helm) use scaleway email #194 ## [1.2.0] - 2024-08-06 diff --git a/secrets b/secrets index 1485c6dc..2643697e 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 1485c6dc9d63bbd2665504be96d77a95b1fe26f2 +Subproject commit 2643697e5f15279f0eca403ba591260e71ec499d diff --git a/src/helm/env.d/preprod/values.impress.yaml.gotmpl b/src/helm/env.d/preprod/values.impress.yaml.gotmpl index ddf5e996..18a6d69b 100644 --- a/src/helm/env.d/preprod/values.impress.yaml.gotmpl +++ b/src/helm/env.d/preprod/values.impress.yaml.gotmpl @@ -24,10 +24,18 @@ backend: secretKeyRef: name: backend key: DJANGO_SUPERUSER_PASSWORD - DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr" - DJANGO_EMAIL_PORT: 465 - DJANGO_EMAIL_USE_SSL: True - DJANGO_EMAIL_FROM: "noreply@docs.numerique.gouv.fr" + DJANGO_EMAIL_HOST: "smtp.tem.scw.cloud" + DJANGO_EMAIL_PORT: 587 + DJANGO_EMAIL_USE_TLS: True + DJANGO_EMAIL_FROM: "noreply@docs.beta.numerique.gouv.fr" + DJANGO_EMAIL_HOST_USER: + secretKeyRef: + name: backend + key: DJANGO_EMAIL_HOST_USER + DJANGO_EMAIL_HOST_PASSWORD: + secretKeyRef: + name: backend + key: DJANGO_EMAIL_HOST_PASSWORD DJANGO_SILENCED_SYSTEM_CHECKS: security.W008,security.W004 OIDC_OP_JWKS_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/jwks OIDC_OP_AUTHORIZATION_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/authorize diff --git a/src/helm/env.d/production/values.impress.yaml.gotmpl b/src/helm/env.d/production/values.impress.yaml.gotmpl index 0b9f7a9a..b029477b 100644 --- a/src/helm/env.d/production/values.impress.yaml.gotmpl +++ b/src/helm/env.d/production/values.impress.yaml.gotmpl @@ -24,10 +24,18 @@ backend: secretKeyRef: name: backend key: DJANGO_SUPERUSER_PASSWORD - DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr" - DJANGO_EMAIL_PORT: 465 - DJANGO_EMAIL_USE_SSL: True - DJANGO_EMAIL_FROM: "noreply@docs.numerique.gouv.fr" + DJANGO_EMAIL_HOST: "smtp.tem.scw.cloud" + DJANGO_EMAIL_PORT: 587 + DJANGO_EMAIL_USE_TLS: True + DJANGO_EMAIL_FROM: "noreply@docs.beta.numerique.gouv.fr" + DJANGO_EMAIL_HOST_USER: + secretKeyRef: + name: backend + key: DJANGO_EMAIL_HOST_USER + DJANGO_EMAIL_HOST_PASSWORD: + secretKeyRef: + name: backend + key: DJANGO_EMAIL_HOST_PASSWORD DJANGO_SILENCED_SYSTEM_CHECKS: security.W008,security.W004 OIDC_OP_JWKS_ENDPOINT: https://auth.agentconnect.gouv.fr/api/v2/jwks OIDC_OP_AUTHORIZATION_ENDPOINT: https://auth.agentconnect.gouv.fr/api/v2/authorize diff --git a/src/helm/env.d/staging/values.impress.yaml.gotmpl b/src/helm/env.d/staging/values.impress.yaml.gotmpl index ba441adb..ae8b2a8d 100644 --- a/src/helm/env.d/staging/values.impress.yaml.gotmpl +++ b/src/helm/env.d/staging/values.impress.yaml.gotmpl @@ -24,10 +24,18 @@ backend: secretKeyRef: name: backend key: DJANGO_SUPERUSER_PASSWORD - DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr" - DJANGO_EMAIL_PORT: 465 - DJANGO_EMAIL_USE_SSL: True - DJANGO_EMAIL_FROM: "noreply@docs.numerique.gouv.fr" + DJANGO_EMAIL_HOST: "smtp.tem.scw.cloud" + DJANGO_EMAIL_PORT: 587 + DJANGO_EMAIL_USE_TLS: True + DJANGO_EMAIL_FROM: "noreply@docs.beta.numerique.gouv.fr" + DJANGO_EMAIL_HOST_USER: + secretKeyRef: + name: backend + key: DJANGO_EMAIL_HOST_USER + DJANGO_EMAIL_HOST_PASSWORD: + secretKeyRef: + name: backend + key: DJANGO_EMAIL_HOST_PASSWORD DJANGO_SILENCED_SYSTEM_CHECKS: security.W008,security.W004 OIDC_OP_JWKS_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/jwks OIDC_OP_AUTHORIZATION_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/authorize diff --git a/src/helm/extra/templates/secrets.yaml b/src/helm/extra/templates/secrets.yaml index e0e78492..3f258157 100644 --- a/src/helm/extra/templates/secrets.yaml +++ b/src/helm/extra/templates/secrets.yaml @@ -6,5 +6,11 @@ stringData: DJANGO_SUPERUSER_EMAIL: {{ .Values.djangoSuperUserEmail }} DJANGO_SUPERUSER_PASSWORD: {{ .Values.djangoSuperUserPass }} DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }} +{{- if .Values.djangoEmailHostUser }} + DJANGO_EMAIL_HOST_USER: {{ .Values.djangoEmailHostUser }} +{{- end }} +{{- if .Values.djangoEmailHostPassword }} + DJANGO_EMAIL_HOST_PASSWORD: {{ .Values.djangoEmailHostPassword }} +{{- end }} OIDC_RP_CLIENT_ID: {{ .Values.oidc.clientId }} OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }}