adding streaming playlist, web videos, user exports, and original vid…

…eo files buckets as configurable values for this helm chart
small-hack · Jan 5, 2025 · 1ea88d9 · 1ea88d9
1 parent c27ac1f
commit 1ea88d9
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 deletions.
diff --git a/charts/peertube/Chart.yaml b/charts/peertube/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: 0.2.1
+version: 0.3.0
 
 # 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

diff --git a/charts/peertube/README.md b/charts/peertube/README.md
@@ -1,6 +1,6 @@
 # peertube
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
 
 A peertube Helm chart for Kubernetes
 
@@ -76,10 +76,18 @@ A peertube Helm chart for Kubernetes
 | peertube.s3.existingSecret | string | `""` | get the credentials for s3 from an existing Kubernetes Secret |
 | peertube.s3.existingSecretKeys.access_key_id | string | `""` | key in existing secret for s3 access_key_id |
 | peertube.s3.existingSecretKeys.endpoint | string | `""` | key in existing secret for s3 endpoint |
+| peertube.s3.existingSecretKeys.original_video_files_bucket | string | `""` | key in existing secret for s3 bucket for original video files |
 | peertube.s3.existingSecretKeys.secret_access_key | string | `""` | key in existing secret for s3 secret_access_key |
+| peertube.s3.existingSecretKeys.streaming_playlists_bucket | string | `""` | key in existing secret for s3 bucket for streaming playlists |
+| peertube.s3.existingSecretKeys.user_exports_bucket | string | `""` | key in existing secret for s3 bucket for user exports |
+| peertube.s3.existingSecretKeys.web_videos_bucket | string | `""` | key in existing secret for s3 bucket for web videos |
+| peertube.s3.original_video_files_bucket | string | `""` | s3 bucket for peertube to store original video files |
 | peertube.s3.secret_access_key | string | `""` | secret access key id for connecting to s3 |
+| peertube.s3.streaming_playlists_bucket | string | `""` | s3 bucket for peertube to store streaming playlists |
 | peertube.s3.upload_acl_private | string | `"private"` |  |
 | peertube.s3.upload_acl_public | string | `"public-read"` |  |
+| peertube.s3.user_exports_bucket | string | `""` | s3 bucket for peertube to store user exports |
+| peertube.s3.web_videos_bucket | string | `""` | s3 bucket for peertube to store web videos |
 | peertube.secret | string | `""` | set peertube's secret |
 | peertube.smtp.disable_starttls | bool | `false` | mail disable starttls |
 | peertube.smtp.existingSecret | string | `""` | use an existing Kubernetes Secret to connect to SMTP host if set, ignores above smtp.host/port/username/password |

diff --git a/charts/peertube/templates/deployment.yaml b/charts/peertube/templates/deployment.yaml
@@ -163,6 +163,42 @@ spec:
               {{- else -}}
               value: {{ .Values.peertube.s3.endpoint }}
               {{- end }}
+            - name: PEERTUBE_OBJECT_STORAGE_STREAMING_PLAYLISTS_BUCKET_NAME
+              {{- if .Values.peertube.s3.existingSecretKeys.streaming_playlists_bucket }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.peertube.s3.existingSecret }}
+                  key: {{ .Values.peertube.s3.existingSecretKeys.streaming_playlists_bucket }}
+              {{- else -}}
+              value: {{ .Values.peertube.s3.streaming_playlists_bucket }}
+              {{- end }}
+            - name: PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_BUCKET_NAME
+              {{- if .Values.peertube.s3.existingSecretKeys.web_videos_bucket }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.peertube.s3.existingSecret }}
+                  key: {{ .Values.peertube.s3.existingSecretKeys.web_videos_bucket }}
+              {{- else -}}
+              value: {{ .Values.peertube.s3.web_videos_bucket }}
+              {{- end }}
+            - name: PEERTUBE_OBJECT_STORAGE_USER_EXPORTS_BUCKET_NAME
+              {{- if .Values.peertube.s3.existingSecretKeys.user_exports_bucket }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.peertube.s3.existingSecret }}
+                  key: {{ .Values.peertube.s3.existingSecretKeys.user_exports_bucket }}
+              {{- else -}}
+              value: {{ .Values.peertube.s3.user_exports_bucket }}
+              {{- end }}
+            - name: PEERTUBE_OBJECT_STORAGE_ORIGINAL_VIDEO_FILES_BUCKET_NAME
+              {{- if .Values.peertube.s3.existingSecretKeys.original_video_files_bucket }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.peertube.s3.existingSecret }}
+                  key: {{ .Values.peertube.s3.existingSecretKeys.original_video_files_bucket }}
+              {{- else -}}
+              value: {{ .Values.peertube.s3.original_video_files_bucket }}
+              {{- end }}
             - name: PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC
               value: {{ .Values.peertube.s3.upload_acl_public }}
             - name: PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE

diff --git a/charts/peertube/values.yaml b/charts/peertube/values.yaml
@@ -192,6 +192,14 @@ peertube:
     enabled: false
     # -- s3 endpoint to connect to for peertube storage
     endpoint: ""
+    # -- s3 bucket for peertube to store streaming playlists
+    streaming_playlists_bucket: ""
+    # -- s3 bucket for peertube to store web videos
+    web_videos_bucket: ""
+    # -- s3 bucket for peertube to store user exports
+    user_exports_bucket: ""
+    # -- s3 bucket for peertube to store original video files
+    original_video_files_bucket: ""
     # -- access key id for connecting to s3
     access_key_id: ""
     # -- secret access key id for connecting to s3
@@ -203,6 +211,14 @@ peertube:
     existingSecretKeys:
       # -- key in existing secret for s3 endpoint
       endpoint: ""
+      # -- key in existing secret for s3 bucket for streaming playlists
+      streaming_playlists_bucket: ""
+      # -- key in existing secret for s3 bucket for web videos
+      web_videos_bucket: ""
+      # -- key in existing secret for s3 bucket for user exports
+      user_exports_bucket: ""
+      # -- key in existing secret for s3 bucket for original video files
+      original_video_files_bucket: ""
       # -- key in existing secret for s3 access_key_id
       access_key_id: ""
       # -- key in existing secret for s3 secret_access_key