diff --git a/src/backend/core/api/demo.py b/src/backend/core/api/demo.py index 677e5d79..27b9e0b2 100644 --- a/src/backend/core/api/demo.py +++ b/src/backend/core/api/demo.py @@ -65,7 +65,7 @@ def minio_webhook(request): object = s3['object'] filename = object['key'] - if bucket_name != settings.AWS_STORAGE_BUCKET_NAME: + if bucket_name != settings.MINIO_BUCKET: logger.info('Not interested in this bucket: %s', bucket_name) return Response("Not interested in this bucket") @@ -78,12 +78,12 @@ def minio_webhook(request): try: client = Minio( - settings.AWS_S3_ENDPOINT_URL, - access_key=settings.AWS_S3_ACCESS_KEY_ID, - secret_key=settings.AWS_S3_SECRET_ACCESS_KEY, + settings.MINIO_URL, + access_key=settings.MINIO_ACCESS_KEY, + secret_key=settings.MINIO_SECRET_KEY, ) except Exception as e: - logger.error("An error occurred while creating the Minio client %s: %s", settings.AWS_S3_ENDPOINT_URL, str(e)) + logger.error("An error occurred while creating the Minio client %s: %s", settings.MINIO_URL, str(e)) temp_file_path = None @@ -92,7 +92,7 @@ def minio_webhook(request): try: - audio_file_stream = client.get_object(settings.AWS_STORAGE_BUCKET_NAME, object_name=filename) + audio_file_stream = client.get_object(settings.MINIO_BUCKET, object_name=filename) with tempfile.NamedTemporaryFile(delete=False, suffix='.ogg') as temp_audio_file: for data in audio_file_stream.stream(32*1024): diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py index dfdee8d6..4682f9f5 100755 --- a/src/backend/meet/settings.py +++ b/src/backend/meet/settings.py @@ -412,6 +412,20 @@ class Base(Configuration): True, environ_name="OPENAI_ENABLE", environ_prefix=None ) + # todo - totally wip + MINIO_ACCESS_KEY = values.Value( + None, environ_name="MINIO_ACCESS_KEY", environ_prefix=None + ) + MINIO_SECRET_KEY = values.Value( + None, environ_name="MINIO_SECRET_KEY", environ_prefix=None + ) + MINIO_URL = values.Value( + None, environ_name="MINIO_URL", environ_prefix=None + ) + MINIO_BUCKET = values.Value( + 'livekit-staging-livekit-egress', environ_name="MINIO_BUCKET", environ_prefix=None + ) + # pylint: disable=invalid-name @property def ENVIRONMENT(self): diff --git a/src/helm/env.d/staging/values.meet.yaml.gotmpl b/src/helm/env.d/staging/values.meet.yaml.gotmpl index 670c3410..0e3e24ed 100644 --- a/src/helm/env.d/staging/values.meet.yaml.gotmpl +++ b/src/helm/env.d/staging/values.meet.yaml.gotmpl @@ -119,6 +119,19 @@ backend: name: backend key: OPENAI_API_KEY OPENAI_ENABLE: False + MINIO_ACCESS_KEY: + secretKeyRef: + name: backend + key: MINIO_ACCESS_KEY + MINIO_SECRET_KEY: + secretKeyRef: + name: backend + key: MINIO_SECRET_KEY + MINIO_URL: + secretKeyRef: + name: backend + key: MINIO_URL + createsuperuser: command: diff --git a/src/helm/meet/templates/secrets.yaml b/src/helm/meet/templates/secrets.yaml index eff18ec8..adae816f 100644 --- a/src/helm/meet/templates/secrets.yaml +++ b/src/helm/meet/templates/secrets.yaml @@ -18,3 +18,13 @@ stringData: {{- if .Values.openaiApiKey }} OPENAI_API_KEY: {{ .Values.openaiApiKey }} {{- end }} +{{- 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 }} +