From 3dcc93b630da705bb0b15cabbeef39ed6e1c4e6e Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Wed, 16 Oct 2024 10:34:17 +0200 Subject: [PATCH] wip feedbacks --- src/backend/core/api/demo.py | 9 ++++---- src/backend/meet/settings.py | 21 ++++++++++++----- .../env.d/production/values.meet.yaml.gotmpl | 17 ++++++++++++++ .../env.d/staging/values.meet.yaml.gotmpl | 23 +++++++++++-------- src/helm/extra/templates/s3.yml | 8 +++++++ src/helm/meet/templates/secrets.yaml | 9 -------- 6 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 src/helm/extra/templates/s3.yml diff --git a/src/backend/core/api/demo.py b/src/backend/core/api/demo.py index 2e4d7e66..d775a1fd 100644 --- a/src/backend/core/api/demo.py +++ b/src/backend/core/api/demo.py @@ -5,7 +5,6 @@ from minio import Minio from django.conf import settings import openai -MINIO_BUCKET = "livekit-staging-livekit-egress" openai_client = openai.OpenAI( api_key=settings.OPENAI_API_KEY, @@ -24,7 +23,7 @@ def minio_webhook(request): object = s3['object'] filename = object['key'] - if bucket_name != MINIO_BUCKET: + if bucket_name != settings.AWS_STORAGE_BUCKET_NAME: return Response("Not interested in this bucket") if object['contentType'] != 'audio/ogg': @@ -33,9 +32,9 @@ def minio_webhook(request): print('file received', filename) client = Minio( - settings.MINIO_URL, - access_key=settings.MINIO_ACCESS_KEY, - secret_key=settings.MINIO_SECRET_KEY, + settings.AWS_S3_ENDPOINT_URL, + access_key=settings.AWS_S3_ACCESS_KEY_ID, + secret_key=settings.AWS_S3_SECRET_ACCESS_KEY, ) room_id = filename.split("_")[2].split(".")[0] diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py index 991377ea..d43f8b3d 100755 --- a/src/backend/meet/settings.py +++ b/src/backend/meet/settings.py @@ -387,15 +387,24 @@ class Base(Configuration): ) # todo - totally wip - MINIO_ACCESS_KEY = values.Value( - None, environ_name="MINIO_ACCESS_KEY", environ_prefix=None + AWS_S3_ENDPOINT_URL = values.Value( + environ_name="AWS_S3_ENDPOINT_URL", environ_prefix=None ) - MINIO_SECRET_KEY = values.Value( - None, environ_name="MINIO_SECRET_KEY", environ_prefix=None + AWS_S3_ACCESS_KEY_ID = values.Value( + environ_name="AWS_S3_ACCESS_KEY_ID", environ_prefix=None ) - MINIO_URL = values.Value( - None, environ_name="MINIO_URL", environ_prefix=None + AWS_S3_SECRET_ACCESS_KEY = values.Value( + environ_name="AWS_S3_SECRET_ACCESS_KEY", environ_prefix=None ) + AWS_S3_REGION_NAME = values.Value( + environ_name="AWS_S3_REGION_NAME", environ_prefix=None + ) + AWS_STORAGE_BUCKET_NAME = values.Value( + "meet-media-storage", + environ_name="AWS_STORAGE_BUCKET_NAME", + environ_prefix=None, + ) + OPENAI_API_KEY = values.Value( None, environ_name="OPENAI_API_KEY", environ_prefix=None ) diff --git a/src/helm/env.d/production/values.meet.yaml.gotmpl b/src/helm/env.d/production/values.meet.yaml.gotmpl index 8844ddbd..75b9b198 100644 --- a/src/helm/env.d/production/values.meet.yaml.gotmpl +++ b/src/helm/env.d/production/values.meet.yaml.gotmpl @@ -99,6 +99,23 @@ backend: FRONTEND_SILENCE_LIVEKIT_DEBUG: False FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio.numerique.gouv.fr'}" FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}" + AWS_S3_ENDPOINT_URL: + secretKeyRef: + name: impress-media-storage.bucket.libre.sh + key: url + AWS_S3_ACCESS_KEY_ID: + secretKeyRef: + name: impress-media-storage.bucket.libre.sh + key: accessKey + AWS_S3_SECRET_ACCESS_KEY: + secretKeyRef: + name: impress-media-storage.bucket.libre.sh + key: secretKey + AWS_STORAGE_BUCKET_NAME: + secretKeyRef: + name: impress-media-storage.bucket.libre.sh + key: bucket + AWS_S3_REGION_NAME: local createsuperuser: command: diff --git a/src/helm/env.d/staging/values.meet.yaml.gotmpl b/src/helm/env.d/staging/values.meet.yaml.gotmpl index b4a1a538..8b5b24d5 100644 --- a/src/helm/env.d/staging/values.meet.yaml.gotmpl +++ b/src/helm/env.d/staging/values.meet.yaml.gotmpl @@ -97,18 +97,23 @@ backend: ALLOW_UNREGISTERED_ROOMS: False FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio-staging.beta.numerique.gouv.fr'}" FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}" - MINIO_ACCESS_KEY: + AWS_S3_ENDPOINT_URL: secretKeyRef: - name: backend - key: MINIO_ACCESS_KEY - MINIO_SECRET_KEY: + name: meet-media-storage.bucket.libre.sh + key: url + AWS_S3_ACCESS_KEY_ID: secretKeyRef: - name: backend - key: MINIO_SECRET_KEY - MINIO_URL: + name: meet-media-storage.bucket.libre.sh + key: accessKey + AWS_S3_SECRET_ACCESS_KEY: secretKeyRef: - name: backend - key: MINIO_URL + name: meet-media-storage.bucket.libre.sh + key: secretKey + AWS_STORAGE_BUCKET_NAME: + secretKeyRef: + name: meet-media-storage.bucket.libre.sh + key: bucket + AWS_S3_REGION_NAME: local OPENAI_API_KEY: secretKeyRef: name: backend diff --git a/src/helm/extra/templates/s3.yml b/src/helm/extra/templates/s3.yml new file mode 100644 index 00000000..4ca831ea --- /dev/null +++ b/src/helm/extra/templates/s3.yml @@ -0,0 +1,8 @@ +apiVersion: core.libre.sh/v1alpha1 +kind: Bucket +metadata: + name: meet-media-storage + namespace: {{ .Release.Namespace | quote }} +spec: + provider: data + versioned: true \ No newline at end of file diff --git a/src/helm/meet/templates/secrets.yaml b/src/helm/meet/templates/secrets.yaml index 47f4bb2d..eff18ec8 100644 --- a/src/helm/meet/templates/secrets.yaml +++ b/src/helm/meet/templates/secrets.yaml @@ -15,15 +15,6 @@ stringData: OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }} LIVEKIT_API_SECRET: {{ .Values.livekitApi.secret }} LIVEKIT_API_KEY: {{ .Values.livekitApi.key }} -{{- if .Values.minioAccessKey }} - MINIO_ACCESS_KEY: {{ .Values.minioAccessKey }} -{{- end }} -{{- if .Values.minioSecretKey }} - MINIO_SECRET_KEY: {{ .Values.minioSecretKey }} -{{- end }} -{{- if .Values.minioUrl }} - MINIO_URL: {{ .Values.minioUrl }} -{{- end }} {{- if .Values.openaiApiKey }} OPENAI_API_KEY: {{ .Values.openaiApiKey }} {{- end }}