Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

fix: add prod cnpg #481

Merged
merged 4 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .kontinuous/env/dev/values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
pg:
~chart: pg

backend:
~needs: [build-backend, pg]
volumes:
- name: uploads
emptyDir: {}
Expand All @@ -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:
Expand Down
15 changes: 0 additions & 15 deletions .kontinuous/env/preprod/values.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
24 changes: 22 additions & 2 deletions .kontinuous/env/prod/values.yaml
Original file line number Diff line number Diff line change
@@ -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
revolunet marked this conversation as resolved.
Show resolved Hide resolved
revolunet marked this conversation as resolved.
Show resolved Hide resolved
- secretRef:
name: azure-tumeplay-volume

frontend-metropole:
host: tumeplay.fabrique.social.gouv.fr
Expand All @@ -19,15 +28,27 @@ 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:
- secretRef:
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:
Expand All @@ -36,9 +57,8 @@ jobs:
buildArgs:
buildenv: preprod.guyane
REACT_APP_MATOMO_ID: "45"

build-frontend-aime:
with:
buildArgs:
buildenv: preprod.aime

17 changes: 4 additions & 13 deletions .kontinuous/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
backend:
~chart: app
~needs: [build-backend]
~needs: [build-backend, pg]
host: "backend-{{ $.Values.global.host }}"
imagePackage: backend
containerPort: 1337
Expand Down Expand Up @@ -29,7 +29,7 @@ backend:
value: "true"
envFrom:
- secretRef:
name: pg-user
name: pg-app
- secretRef:
name: backend-sealed-secret
- secretRef:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Loading