From 68def45ac85d565eb963a7c189f9ac98a3277c61 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Mon, 30 Oct 2023 13:47:37 +0100 Subject: [PATCH] Use different s3 buckets for each env --- infra/kube/helm/dev.values.yaml | 3 ++- infra/kube/helm/prod.values.yaml | 3 ++- infra/kube/helm/staging.values.yaml | 3 ++- infra/kube/helm/templates/configmap.yaml | 2 +- infra/kube/helm/values-dso.yaml | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/infra/kube/helm/dev.values.yaml b/infra/kube/helm/dev.values.yaml index 0df9d5a0..ab3502e0 100644 --- a/infra/kube/helm/dev.values.yaml +++ b/infra/kube/helm/dev.values.yaml @@ -1,3 +1,4 @@ ingress.hosts[0].host: qualif.basegun.interieur.gouv.fr backend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-backend -frontend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-frontend \ No newline at end of file +frontend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-frontend +backend.config.s3_bucket_name: basegun-s3-dev \ No newline at end of file diff --git a/infra/kube/helm/prod.values.yaml b/infra/kube/helm/prod.values.yaml index 5a9b279d..8d1ac80d 100644 --- a/infra/kube/helm/prod.values.yaml +++ b/infra/kube/helm/prod.values.yaml @@ -1,3 +1,4 @@ ingress.hosts[0].host: basegun.interieur.gouv.fr backend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-backend -frontend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-frontend \ No newline at end of file +frontend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-frontend +backend.config.s3_bucket_name: basegun-s3 \ No newline at end of file diff --git a/infra/kube/helm/staging.values.yaml b/infra/kube/helm/staging.values.yaml index 83be0a46..83c165cc 100644 --- a/infra/kube/helm/staging.values.yaml +++ b/infra/kube/helm/staging.values.yaml @@ -1,3 +1,4 @@ ingress.hosts[0].host: preprod.basegun.interieur.gouv.fr backend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-backend -frontend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-frontend \ No newline at end of file +frontend.image.repository: registry.dso.interieur.rie.gouv.fr/mi-basegun/basegun-frontend +backend.config.s3_bucket_name: basegun-s3-staging \ No newline at end of file diff --git a/infra/kube/helm/templates/configmap.yaml b/infra/kube/helm/templates/configmap.yaml index 27f8260f..c4b005c9 100644 --- a/infra/kube/helm/templates/configmap.yaml +++ b/infra/kube/helm/templates/configmap.yaml @@ -6,7 +6,7 @@ data: WORKSPACE: {{ .Values.backend.config.workspace }} PATH_LOGS: /tmp/log/basegun/ S3_URL_ENDPOINT: https://basegun-8b03-s3.s3obj.ecs.objstore.r1.pi2.minint.fr - S3_BUCKET_NAME: basegun-s3 + S3_BUCKET_NAME: {{ .Values.backend.config.s3_bucket_name }} --- apiVersion: v1 kind: ConfigMap diff --git a/infra/kube/helm/values-dso.yaml b/infra/kube/helm/values-dso.yaml index f2c4302b..b40ea7dc 100644 --- a/infra/kube/helm/values-dso.yaml +++ b/infra/kube/helm/values-dso.yaml @@ -35,6 +35,7 @@ backend: targetCPUUtilizationPercentage: 80 config: workspace: preprod + s3_bucket_name: basegun-s3 secret: create: false sops: true