diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml index 1796504b..179164ce 100644 --- a/.kontinuous/env/dev/values.yaml +++ b/.kontinuous/env/dev/values.yaml @@ -1,8 +1,4 @@ -pg: - ~chart: pg - backend: - ~needs: [build-backend, pg] volumes: - name: uploads emptyDir: {} @@ -11,12 +7,11 @@ backend: name: uploads envFrom: - secretRef: - name: "pg-app" + name: pg-app - secretRef: name: backend-sealed-secret - configMapRef: name: backend-configmap - jobs: runs: build-frontend-guyane: diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml index 1d3d6639..ac85fe54 100644 --- a/.kontinuous/env/preprod/values.yaml +++ b/.kontinuous/env/preprod/values.yaml @@ -1,21 +1,6 @@ -pg: - ~chart: pg - backup: - enabled: true - dashboard: host: "bo-tumeplay-preprod.ovh.fabrique.social.gouv.fr" -backend: - ~needs: [build-backend, pg] - envFrom: - - secretRef: - name: "pg-app" - - secretRef: - name: backend-sealed-secret - - configMapRef: - name: backend-configmap - jobs: runs: build-frontend-guyane: diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml index d83cee13..bcc86bbe 100644 --- a/.kontinuous/env/prod/values.yaml +++ b/.kontinuous/env/prod/values.yaml @@ -1,5 +1,14 @@ backend: host: backend-tumeplay.fabrique.social.gouv.fr + envFrom: + - secretRef: + name: pg-user # temporary + - secretRef: + name: backend-sealed-secret + - configMapRef: + name: backend-configmap + - secretRef: + name: azure-tumeplay-volume frontend-metropole: host: tumeplay.fabrique.social.gouv.fr @@ -19,8 +28,13 @@ frontend-aime: dashboard: host: bo-tumeplay.fabrique.social.gouv.fr +pg-metabase: + ~chart: pg + metabase: enabled: true + ~chart: metabase + #~needs: ["pg-metabase"] # ingress: # enabled: false envFrom: @@ -28,6 +42,13 @@ metabase: name: metabase-pg-user - configMapRef: name: metabase-configmap + #env: + # - name: MB_DB_CONNECTION_URI + # valueFrom: + # - secretKeyRef: + # name: pg-metabase-app + # key: DATABASE_URL + #postgresql://${PG_HOST}/metabase?user=xxx&password=yyy&ssl=require" jobs: runs: @@ -36,9 +57,8 @@ jobs: buildArgs: buildenv: preprod.guyane REACT_APP_MATOMO_ID: "45" - + build-frontend-aime: with: buildArgs: buildenv: preprod.aime - \ No newline at end of file diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml index a26ae5e0..41bf43f8 100644 --- a/.kontinuous/values.yaml +++ b/.kontinuous/values.yaml @@ -1,6 +1,6 @@ backend: ~chart: app - ~needs: [build-backend] + ~needs: [build-backend, pg] host: "backend-{{ $.Values.global.host }}" imagePackage: backend containerPort: 1337 @@ -29,7 +29,7 @@ backend: value: "true" envFrom: - secretRef: - name: pg-user + name: pg-app - secretRef: name: backend-sealed-secret - secretRef: @@ -73,12 +73,10 @@ dashboard: imagePackage: dashboard containerPort: 8080 -metabase: - ~chart: metabase - enabled: false +pg: + ~chart: pg jobs: - ~chart: jobs runs: build-backend: use: build @@ -123,10 +121,3 @@ jobs: context: tumeplay-dashboard buildArgs: REACT_APP_API_URL: https://backend-{{ .Values.global.host }} - -deactivate: - jobs-deactivate: - runs: - deactivate: - with: - db: true