From d9166e489d47893557f7e9d5ebcef062261e1eec Mon Sep 17 00:00:00 2001 From: antoine lebaud Date: Wed, 10 Jul 2024 23:17:32 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F(backend)=20remove=20usele?= =?UTF-8?q?ss=20cold=20storage=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No S3 bucket or cold storage are required yet in the project. As the charts related to these pieces were removed, clean Dajngo configuration. --- src/backend/meet/settings.py | 21 ------------------- src/helm/env.d/dev/values.meet.yaml.gotmpl | 4 ---- .../env.d/preprod/values.meet.yaml.gotmpl | 17 --------------- .../env.d/production/values.meet.yaml.gotmpl | 17 --------------- .../env.d/staging/values.meet.yaml.gotmpl | 17 --------------- 5 files changed, 76 deletions(-) diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py index f0328164..a43c6012 100755 --- a/src/backend/meet/settings.py +++ b/src/backend/meet/settings.py @@ -116,27 +116,6 @@ class Base(Configuration): }, } - # Media - AWS_S3_ENDPOINT_URL = values.Value( - environ_name="AWS_S3_ENDPOINT_URL", environ_prefix=None - ) - AWS_S3_ACCESS_KEY_ID = values.Value( - environ_name="AWS_S3_ACCESS_KEY_ID", 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, - ) - - S3_VERSIONS_PAGE_SIZE = 50 - # Internationalization # https://docs.djangoproject.com/en/3.1/topics/i18n/ diff --git a/src/helm/env.d/dev/values.meet.yaml.gotmpl b/src/helm/env.d/dev/values.meet.yaml.gotmpl index 144271fb..c881ff69 100644 --- a/src/helm/env.d/dev/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev/values.meet.yaml.gotmpl @@ -38,10 +38,6 @@ backend: POSTGRES_USER: dinum POSTGRES_PASSWORD: pass REDIS_URL: redis://default:pass@redis-master:6379/1 - AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000 - AWS_S3_ACCESS_KEY_ID: meet - AWS_S3_SECRET_ACCESS_KEY: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage {{- with .Values.livekit.keys }} {{- range $key, $value := . }} diff --git a/src/helm/env.d/preprod/values.meet.yaml.gotmpl b/src/helm/env.d/preprod/values.meet.yaml.gotmpl index f211930f..ce70b75a 100644 --- a/src/helm/env.d/preprod/values.meet.yaml.gotmpl +++ b/src/helm/env.d/preprod/values.meet.yaml.gotmpl @@ -83,23 +83,6 @@ backend: secretKeyRef: name: redis.redis.libre.sh key: url - AWS_S3_ENDPOINT_URL: - secretKeyRef: - name: meet-media-storage.bucket.libre.sh - key: url - AWS_S3_ACCESS_KEY_ID: - secretKeyRef: - name: meet-media-storage.bucket.libre.sh - key: accessKey - AWS_S3_SECRET_ACCESS_KEY: - secretKeyRef: - 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 STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage LIVEKIT_API_SECRET: secretKeyRef: diff --git a/src/helm/env.d/production/values.meet.yaml.gotmpl b/src/helm/env.d/production/values.meet.yaml.gotmpl index 337d8f9e..b2a4e96b 100644 --- a/src/helm/env.d/production/values.meet.yaml.gotmpl +++ b/src/helm/env.d/production/values.meet.yaml.gotmpl @@ -83,23 +83,6 @@ backend: secretKeyRef: name: redis.redis.libre.sh key: url - AWS_S3_ENDPOINT_URL: - secretKeyRef: - name: meet-media-storage.bucket.libre.sh - key: url - AWS_S3_ACCESS_KEY_ID: - secretKeyRef: - name: meet-media-storage.bucket.libre.sh - key: accessKey - AWS_S3_SECRET_ACCESS_KEY: - secretKeyRef: - 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 STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage LIVEKIT_API_SECRET: secretKeyRef: diff --git a/src/helm/env.d/staging/values.meet.yaml.gotmpl b/src/helm/env.d/staging/values.meet.yaml.gotmpl index e111ce6c..13748ac2 100644 --- a/src/helm/env.d/staging/values.meet.yaml.gotmpl +++ b/src/helm/env.d/staging/values.meet.yaml.gotmpl @@ -83,23 +83,6 @@ backend: secretKeyRef: name: redis.redis.libre.sh key: url - AWS_S3_ENDPOINT_URL: - secretKeyRef: - name: meet-media-storage.bucket.libre.sh - key: url - AWS_S3_ACCESS_KEY_ID: - secretKeyRef: - name: meet-media-storage.bucket.libre.sh - key: accessKey - AWS_S3_SECRET_ACCESS_KEY: - secretKeyRef: - 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 STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage LIVEKIT_API_SECRET: secretKeyRef: