Skip to content

Commit 3f996aa

Browse files
roujarouja
committed
♻️(tilt) use hem dev-backend chart
Use the helm dev-backend chart to share the backend across all projects
1 parent 51ed277 commit 3f996aa

16 files changed

+126
-438
lines changed

‎bin/Tiltfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,13 @@ clean_old_images('localhost:5001/meet-livekit')
8585

8686
k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev} template .'))
8787

88-
k8s_resource('minio-bucket', resource_deps=['minio'])
89-
k8s_resource('meet-backend', resource_deps=['postgresql', 'minio', 'redis', 'livekit-livekit-server'])
90-
k8s_resource('meet-backend-migrate', resource_deps=['meet-backend'])
88+
k8s_resource('meet-backend', resource_deps=['dev-backend-redis', 'dev-backend-keycloak', 'dev-backend-postgres', 'livekit-livekit-server', 'dev-backend-minio:statefulset'])
89+
k8s_resource('meet-backend-migrate', resource_deps=['dev-backend-postgres'])
90+
k8s_resource('livekit-livekit-server', resource_deps=['dev-backend-redis'])
9191
k8s_resource('livekit-livekit-server-test-connection', resource_deps=['livekit-livekit-server'])
92-
k8s_resource('keycloak', resource_deps=['kc-postgresql'])
9392
k8s_resource('meet-backend-createsuperuser', resource_deps=['meet-backend-migrate'])
93+
k8s_resource('dev-backend-keycloak', resource_deps=['dev-backend-keycloak-pg'])
94+
k8s_resource('livekit-egress', resource_deps=['livekit-livekit-server'])
9495

9596
migration = '''
9697
set -eu

‎src/helm/env.d/dev-dinum/values.egress.yaml.gotmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ egress:
1313
{{- end }}
1414
{{- end }}
1515
redis:
16-
address: redis-master:6379
16+
address: dev-backend-redis:6379
1717
password: pass
18+
username: user
1819
s3:
1920
access_key: meet
2021
secret: password

‎src/helm/env.d/dev-dinum/values.livekit.yaml.gotmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ livekit:
1414
port_range_end: 60000
1515
tcp_port: 7881
1616
redis:
17-
address: redis-master:6379
17+
address: dev-backend-redis:6379
1818
password: pass
19+
username: user
1920
keys:
2021
turn:
2122
enabled: true

‎src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,21 @@ backend:
3535
LOGIN_REDIRECT_URL: https://meet.127.0.0.1.nip.io
3636
LOGIN_REDIRECT_URL_FAILURE: https://meet.127.0.0.1.nip.io
3737
LOGOUT_REDIRECT_URL: https://meet.127.0.0.1.nip.io
38-
DB_HOST: postgres
39-
DB_NAME: meet
40-
DB_USER: dinum
41-
DB_PASSWORD: pass
38+
DB_HOST: dev-backend-postgres
39+
DB_NAME:
40+
secretKeyRef:
41+
name: dev-backend-postgres
42+
key: database
43+
DB_USER:
44+
secretKeyRef:
45+
name: dev-backend-postgres
46+
key: username
47+
DB_PASSWORD:
48+
secretKeyRef:
49+
name: dev-backend-postgres
50+
key: password
4251
DB_PORT: 5432
43-
REDIS_URL: redis://default:pass@redis-master:6379/1
52+
REDIS_URL: redis://user:pass@dev-backend-redis:6379/1
4453
STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
4554
{{- with .Values.livekit.keys }}
4655
{{- range $key, $value := . }}
@@ -58,8 +67,8 @@ backend:
5867
FRONTEND_USE_FRENCH_GOV_FOOTER: True
5968
FRONTEND_USE_PROCONNECT_BUTTON: True
6069
FRONTEND_MANIFEST_LINK: "https://docs.numerique.gouv.fr/docs/1ef86abf-f7e0-46ce-b6c7-8be8b8af4c3d/"
61-
AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000
62-
AWS_S3_ACCESS_KEY_ID: meet
70+
AWS_S3_ENDPOINT_URL: http://dev-backend-minio.meet.svc.cluster.local:9000
71+
AWS_S3_ACCESS_KEY_ID: dinum
6372
AWS_S3_SECRET_ACCESS_KEY: password
6473
AWS_STORAGE_BUCKET_NAME: meet-media-storage
6574
AWS_S3_REGION_NAME: local

‎src/helm/env.d/dev-keycloak/values.egress.yaml.gotmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ egress:
1313
{{- end }}
1414
{{- end }}
1515
redis:
16-
address: redis-master:6379
16+
address: dev-backend-redis:6379
1717
password: pass
18+
username: user
1819
s3:
1920
access_key: meet
2021
secret: password

‎src/helm/env.d/dev-keycloak/values.livekit.yaml.gotmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ livekit:
1414
port_range_end: 60000
1515
tcp_port: 7881
1616
redis:
17-
address: redis-master:6379
17+
address: dev-backend-redis:6379
1818
password: pass
19+
username: user
1920
keys:
2021
turn:
2122
enabled: true

‎src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,21 @@ backend:
3535
LOGIN_REDIRECT_URL: https://meet.127.0.0.1.nip.io
3636
LOGIN_REDIRECT_URL_FAILURE: https://meet.127.0.0.1.nip.io
3737
LOGOUT_REDIRECT_URL: https://meet.127.0.0.1.nip.io
38-
DB_HOST: postgres
39-
DB_NAME: meet
40-
DB_USER: dinum
41-
DB_PASSWORD: pass
38+
DB_HOST: dev-backend-postgres
39+
DB_NAME:
40+
secretKeyRef:
41+
name: dev-backend-postgres
42+
key: database
43+
DB_USER:
44+
secretKeyRef:
45+
name: dev-backend-postgres
46+
key: username
47+
DB_PASSWORD:
48+
secretKeyRef:
49+
name: dev-backend-postgres
50+
key: password
4251
DB_PORT: 5432
43-
REDIS_URL: redis://default:pass@redis-master:6379/1
52+
REDIS_URL: redis://user:pass@dev-backend-redis:6379/1
4453
STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
4554
{{- with .Values.livekit.keys }}
4655
{{- range $key, $value := . }}
@@ -57,8 +66,8 @@ backend:
5766
FRONTEND_TRANSCRIPT: "{'form_beta_users': 'https://grist.numerique.gouv.fr/o/docs/forms/3fFfvJoTBEQ6ZiMi8zsQwX/17'}"
5867
FRONTEND_FEEDBACK: "{'url': 'https://grist.numerique.gouv.fr/o/docs/cbMv4G7pLY3Z/USER-RESEARCH-or-LA-SUITE/f/26'}"
5968
FRONTEND_MANIFEST_LINK: "https://docs.numerique.gouv.fr/docs/1ef86abf-f7e0-46ce-b6c7-8be8b8af4c3d/"
60-
AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000
61-
AWS_S3_ACCESS_KEY_ID: meet
69+
AWS_S3_ENDPOINT_URL: http://dev-backend-minio.meet.svc.cluster.local:9000
70+
AWS_S3_ACCESS_KEY_ID: dinum
6271
AWS_S3_SECRET_ACCESS_KEY: password
6372
AWS_STORAGE_BUCKET_NAME: meet-media-storage
6473
AWS_S3_REGION_NAME: local

‎src/helm/env.d/dev/values.egress.yaml.gotmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ egress:
1313
{{- end }}
1414
{{- end }}
1515
redis:
16-
address: redis-master:6379
16+
address: dev-backend-redis:6379
1717
password: pass
18+
username: user
1819
s3:
1920
access_key: meet
2021
secret: password

‎src/helm/env.d/dev/values.livekit.yaml.gotmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ livekit:
1414
port_range_end: 60000
1515
tcp_port: 7881
1616
redis:
17-
address: redis-master:6379
17+
address: dev-backend-redis:6379
1818
password: pass
19+
username: user
1920
keys:
2021
turn:
2122
enabled: true

‎src/helm/env.d/dev/values.meet.yaml.gotmpl‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,21 @@ backend:
5757
LOGIN_REDIRECT_URL: https://meet.127.0.0.1.nip.io
5858
LOGIN_REDIRECT_URL_FAILURE: https://meet.127.0.0.1.nip.io
5959
LOGOUT_REDIRECT_URL: https://meet.127.0.0.1.nip.io
60-
DB_HOST: postgres
61-
DB_NAME: meet
62-
DB_USER: dinum
63-
DB_PASSWORD: pass
60+
DB_HOST: dev-backend-postgres
61+
DB_NAME:
62+
secretKeyRef:
63+
name: dev-backend-postgres
64+
key: database
65+
DB_USER:
66+
secretKeyRef:
67+
name: dev-backend-postgres
68+
key: username
69+
DB_PASSWORD:
70+
secretKeyRef:
71+
name: dev-backend-postgres
72+
key: password
6473
DB_PORT: 5432
65-
REDIS_URL: redis://default:pass@redis-master:6379/1
74+
REDIS_URL: redis://user:pass@dev-backend-redis:6379/1
6675
STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
6776
{{- with .Values.livekit.keys }}
6877
{{- range $key, $value := . }}
@@ -74,8 +83,8 @@ backend:
7483
ALLOW_UNREGISTERED_ROOMS: False
7584
FRONTEND_SILENCE_LIVEKIT_DEBUG: False
7685
FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}"
77-
AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000
78-
AWS_S3_ACCESS_KEY_ID: meet
86+
AWS_S3_ENDPOINT_URL: http://dev-backend-minio.meet.svc.cluster.local:9000
87+
AWS_S3_ACCESS_KEY_ID: dinum
7988
AWS_S3_SECRET_ACCESS_KEY: password
8089
AWS_STORAGE_BUCKET_NAME: meet-media-storage
8190
AWS_S3_REGION_NAME: local

0 commit comments

Comments
 (0)