Add S3 config to ugc

subshell · Jan 30, 2025 · 6c4744a · 6c4744a
1 parent 36ddd79
commit 6c4744a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/charts/sophora-ugc/CHANGELOG.md b/charts/sophora-ugc/CHANGELOG.md
@@ -4,3 +4,7 @@
 
 - UGC Multimedia can now be deployed along with UGC
 - Configuration options in the values.yaml were restructured. An example configuration with the new structure can be found in the README.md.
+
+## 2.0.2
+
+- Add S3 submission connection for UGC
diff --git a/charts/sophora-ugc/Chart.yaml b/charts/sophora-ugc/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.1
+version: 2.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -26,9 +26,7 @@ appVersion: '4.8.0'
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: UGC Multimedia Service can now be deployed along with UGC
-    - kind: changed
-      description: Configuration options in the values.yaml were restructured. An example configuration with the new structure can be found in the README.md.
+      description: Add S3 connection for UGC
   artifacthub.io/links: |
     - name: Documentation for Sophora UGC 
       url: https://subshell.com/docs/ugc/
diff --git a/charts/sophora-ugc/README.md b/charts/sophora-ugc/README.md
@@ -48,6 +48,10 @@ authentication:
       name: secret-name
       accessKeyKey: binarystore-access-key
       secretIdKey: binarystore-secret-id
+    s3bucket:
+      name: s3bucket-secret
+      accessKeyKey: s3bucket-access-key
+      secretIdKey: s3bucket-secret-id
 
 ugc:
   image:

diff --git a/charts/sophora-ugc/templates/deployment.yaml b/charts/sophora-ugc/templates/deployment.yaml
@@ -55,6 +55,16 @@ spec:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.database.passwordKey }}
                   name: {{ .Values.authentication.secret.database.name }}
+            - name: SUBMISSIONS_S3_ACCESSKEYID
+              valueFrom:
+                secretKeyRef:
+                  key: {{ .Values.authentication.secret.s3bucket.accessKeyKey }}
+                  name: {{ .Values.authentication.secret.s3bucket.name }}
+            - name: SUBMISSIONS_S3_SECRETACCESSKEY
+              valueFrom:
+                secretKeyRef:
+                  key: {{ .Values.authentication.secret.s3bucket.secretIdKey }}
+                  name: {{ .Values.authentication.secret.s3bucket.name }}
             {{ if .Values.env -}}
             {{- toYaml .Values.env | nindent 12 }}
             {{- end }}

diff --git a/charts/sophora-ugc/test-values.yaml b/charts/sophora-ugc/test-values.yaml
@@ -23,7 +23,11 @@ authentication:
     binarystore:
       name: secret-name
       accessKeyKey: binarystore-access-key
-      secretIdKey: binarystore-secret-id 
+      secretIdKey: binarystore-secret-id
+    s3bucket:
+      name: s3bucket-secret
+      accessKeyKey: s3bucket-access-key
+      secretIdKey: s3bucket-secret-id
 
 ugc:
   image:
@@ -192,6 +196,12 @@ ugcMultimedia:
       # type: fs
       # fs:
       #   baseDir: /binaries/
+    submissions:
+      s3:
+        accessKeyId: ${BINARY_STORE_ACCESS_KEY}
+        secretAccessKey: ${BINARY_STORE_SECRET_ID}
+        bucketName: <bucketName>
+        host: <host>
 
     multimedia:
       allowedMimeTypes:

diff --git a/charts/sophora-ugc/values.yaml b/charts/sophora-ugc/values.yaml
@@ -39,6 +39,10 @@ authentication:
       name: secret-name
       accessKeyKey: binarystore-access-key
       secretIdKey: binarystore-secret-id
+    s3bucket:
+      name: s3bucket-secret
+      accessKeyKey: s3bucket-access-key
+      secretIdKey: s3bucket-secret-id
 
 ugc:
   image: