From 632a96ccf44e466fe9d36a00f5f6b71a42c40db6 Mon Sep 17 00:00:00 2001 From: Quentin BEY Date: Wed, 4 Dec 2024 15:23:21 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(helm)=20fix=20the=20configuration?= =?UTF-8?q?=20environment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The configuration also defines the Sentry environment value, which is currently "production" for every Sentry event. - dev: Local - staging: Staging - preprod: PreProduction - prod: Production --- CHANGELOG.md | 4 ++++ src/backend/people/settings.py | 11 +++++++++++ src/helm/env.d/dev/values.desk.yaml.gotmpl | 2 +- src/helm/env.d/preprod/values.desk.yaml.gotmpl | 2 +- src/helm/env.d/staging/values.desk.yaml.gotmpl | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6051f9..6312209 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ and this project adheres to - ♻️(contacts) move user profile to contact #572 - ♻️(contacts) split api test module in actions #573 +### Fixed + +- 🔧(helm) fix the configuration environment #579 + ## [1.7.1] - 2024-11-28 ## [1.7.0] - 2024-11-28 diff --git a/src/backend/people/settings.py b/src/backend/people/settings.py index 22db4dd..a7e96ba 100755 --- a/src/backend/people/settings.py +++ b/src/backend/people/settings.py @@ -790,6 +790,17 @@ class Feature(Production): """ +class Local(Production): + """ + Local environment settings + + This configuration is used by the developers to run the application + locally through the helm files (used for tilt) + + nota bene: it should inherit from the Production environment. + """ + + class Staging(Production): """ Staging environment settings diff --git a/src/helm/env.d/dev/values.desk.yaml.gotmpl b/src/helm/env.d/dev/values.desk.yaml.gotmpl index 748b6cf..76f05d7 100644 --- a/src/helm/env.d/dev/values.desk.yaml.gotmpl +++ b/src/helm/env.d/dev/values.desk.yaml.gotmpl @@ -7,7 +7,7 @@ backend: replicas: 1 envVars: DJANGO_CSRF_TRUSTED_ORIGINS: https://desk.127.0.0.1.nip.io,http://desk.127.0.0.1.nip.io - DJANGO_CONFIGURATION: Production + DJANGO_CONFIGURATION: Local DJANGO_ALLOWED_HOSTS: "*" DJANGO_SECRET_KEY: secretKeyRef: diff --git a/src/helm/env.d/preprod/values.desk.yaml.gotmpl b/src/helm/env.d/preprod/values.desk.yaml.gotmpl index 91ef7d0..22b837b 100644 --- a/src/helm/env.d/preprod/values.desk.yaml.gotmpl +++ b/src/helm/env.d/preprod/values.desk.yaml.gotmpl @@ -9,7 +9,7 @@ backend: argocd.argoproj.io/hook-delete-policy: HookSucceeded envVars: DJANGO_CSRF_TRUSTED_ORIGINS: https://desk-preprod.beta.numerique.gouv.fr - DJANGO_CONFIGURATION: Production + DJANGO_CONFIGURATION: PreProduction DJANGO_ALLOWED_HOSTS: "*" DJANGO_SECRET_KEY: secretKeyRef: diff --git a/src/helm/env.d/staging/values.desk.yaml.gotmpl b/src/helm/env.d/staging/values.desk.yaml.gotmpl index 6a0d8da..5b88595 100644 --- a/src/helm/env.d/staging/values.desk.yaml.gotmpl +++ b/src/helm/env.d/staging/values.desk.yaml.gotmpl @@ -11,7 +11,7 @@ backend: DJANGO_ADMIN_HEADER_BACKGROUND: "#0f5132" DJANGO_ADMIN_HEADER_COLOR: "#ffffff" DJANGO_CSRF_TRUSTED_ORIGINS: http://desk-staging.beta.numerique.gouv.fr,https://desk-staging.beta.numerique.gouv.fr - DJANGO_CONFIGURATION: Production + DJANGO_CONFIGURATION: Staging DJANGO_ALLOWED_HOSTS: "*" DJANGO_SECRET_KEY: secretKeyRef: