Skip to content

Commit 31e1fdb

Browse files
cloudymaxcloudymax
authored
Merge pull request #13 from small-hack/allow-bucket-configuration
adding streaming playlist, web videos, user exports, and original video files buckets as configurable values
2 parents c27ac1f + ea2d081 commit 31e1fdb

File tree

4 files changed

+63
-3
lines changed

4 files changed

+63
-3
lines changed

‎charts/peertube/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.2.1
18+
version: 0.3.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/peertube/README.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# peertube
22

3-
![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)
3+
![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)
44

55
A peertube Helm chart for Kubernetes
66

@@ -76,10 +76,18 @@ A peertube Helm chart for Kubernetes
7676
| peertube.s3.existingSecret | string | `""` | get the credentials for s3 from an existing Kubernetes Secret |
7777
| peertube.s3.existingSecretKeys.access_key_id | string | `""` | key in existing secret for s3 access_key_id |
7878
| peertube.s3.existingSecretKeys.endpoint | string | `""` | key in existing secret for s3 endpoint |
79+
| peertube.s3.existingSecretKeys.original_video_files_bucket | string | `""` | key in existing secret for s3 bucket for original video files |
7980
| peertube.s3.existingSecretKeys.secret_access_key | string | `""` | key in existing secret for s3 secret_access_key |
81+
| peertube.s3.existingSecretKeys.streaming_playlists_bucket | string | `""` | key in existing secret for s3 bucket for streaming playlists |
82+
| peertube.s3.existingSecretKeys.user_exports_bucket | string | `""` | key in existing secret for s3 bucket for user exports |
83+
| peertube.s3.existingSecretKeys.web_videos_bucket | string | `""` | key in existing secret for s3 bucket for web videos |
84+
| peertube.s3.original_video_files_bucket | string | `""` | s3 bucket for peertube to store original video files |
8085
| peertube.s3.secret_access_key | string | `""` | secret access key id for connecting to s3 |
86+
| peertube.s3.streaming_playlists_bucket | string | `""` | s3 bucket for peertube to store streaming playlists |
8187
| peertube.s3.upload_acl_private | string | `"private"` | |
8288
| peertube.s3.upload_acl_public | string | `"public-read"` | |
89+
| peertube.s3.user_exports_bucket | string | `""` | s3 bucket for peertube to store user exports |
90+
| peertube.s3.web_videos_bucket | string | `""` | s3 bucket for peertube to store web videos |
8391
| peertube.secret | string | `""` | set peertube's secret |
8492
| peertube.smtp.disable_starttls | bool | `false` | mail disable starttls |
8593
| peertube.smtp.existingSecret | string | `""` | use an existing Kubernetes Secret to connect to SMTP host if set, ignores above smtp.host/port/username/password |
@@ -116,4 +124,4 @@ A peertube Helm chart for Kubernetes
116124
| volumes | list | `[{"configMap":{"name":"peertube-config"},"name":"peertube-config"},{"configMap":{"name":"custom-env-vars"},"name":"custom-env-vars"},{"name":"peertube-data","persistentVolumeClaim":{"claimName":"peertube-data"}}]` | Additional volumes on the output Deployment definition. |
117125

118126
----------------------------------------------
119-
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
127+
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

‎charts/peertube/templates/deployment.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,42 @@ spec:
163163
{{- else -}}
164164
value: {{ .Values.peertube.s3.endpoint }}
165165
{{- end }}
166+
- name: PEERTUBE_OBJECT_STORAGE_STREAMING_PLAYLISTS_BUCKET_NAME
167+
{{- if .Values.peertube.s3.existingSecretKeys.streaming_playlists_bucket }}
168+
valueFrom:
169+
secretKeyRef:
170+
name: {{ .Values.peertube.s3.existingSecret }}
171+
key: {{ .Values.peertube.s3.existingSecretKeys.streaming_playlists_bucket }}
172+
{{- else -}}
173+
value: {{ .Values.peertube.s3.streaming_playlists_bucket }}
174+
{{- end }}
175+
- name: PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_BUCKET_NAME
176+
{{- if .Values.peertube.s3.existingSecretKeys.web_videos_bucket }}
177+
valueFrom:
178+
secretKeyRef:
179+
name: {{ .Values.peertube.s3.existingSecret }}
180+
key: {{ .Values.peertube.s3.existingSecretKeys.web_videos_bucket }}
181+
{{- else -}}
182+
value: {{ .Values.peertube.s3.web_videos_bucket }}
183+
{{- end }}
184+
- name: PEERTUBE_OBJECT_STORAGE_USER_EXPORTS_BUCKET_NAME
185+
{{- if .Values.peertube.s3.existingSecretKeys.user_exports_bucket }}
186+
valueFrom:
187+
secretKeyRef:
188+
name: {{ .Values.peertube.s3.existingSecret }}
189+
key: {{ .Values.peertube.s3.existingSecretKeys.user_exports_bucket }}
190+
{{- else -}}
191+
value: {{ .Values.peertube.s3.user_exports_bucket }}
192+
{{- end }}
193+
- name: PEERTUBE_OBJECT_STORAGE_ORIGINAL_VIDEO_FILES_BUCKET_NAME
194+
{{- if .Values.peertube.s3.existingSecretKeys.original_video_files_bucket }}
195+
valueFrom:
196+
secretKeyRef:
197+
name: {{ .Values.peertube.s3.existingSecret }}
198+
key: {{ .Values.peertube.s3.existingSecretKeys.original_video_files_bucket }}
199+
{{- else -}}
200+
value: {{ .Values.peertube.s3.original_video_files_bucket }}
201+
{{- end }}
166202
- name: PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC
167203
value: {{ .Values.peertube.s3.upload_acl_public }}
168204
- name: PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE

‎charts/peertube/values.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,14 @@ peertube:
192192
enabled: false
193193
# -- s3 endpoint to connect to for peertube storage
194194
endpoint: ""
195+
# -- s3 bucket for peertube to store streaming playlists
196+
streaming_playlists_bucket: ""
197+
# -- s3 bucket for peertube to store web videos
198+
web_videos_bucket: ""
199+
# -- s3 bucket for peertube to store user exports
200+
user_exports_bucket: ""
201+
# -- s3 bucket for peertube to store original video files
202+
original_video_files_bucket: ""
195203
# -- access key id for connecting to s3
196204
access_key_id: ""
197205
# -- secret access key id for connecting to s3
@@ -203,6 +211,14 @@ peertube:
203211
existingSecretKeys:
204212
# -- key in existing secret for s3 endpoint
205213
endpoint: ""
214+
# -- key in existing secret for s3 bucket for streaming playlists
215+
streaming_playlists_bucket: ""
216+
# -- key in existing secret for s3 bucket for web videos
217+
web_videos_bucket: ""
218+
# -- key in existing secret for s3 bucket for user exports
219+
user_exports_bucket: ""
220+
# -- key in existing secret for s3 bucket for original video files
221+
original_video_files_bucket: ""
206222
# -- key in existing secret for s3 access_key_id
207223
access_key_id: ""
208224
# -- key in existing secret for s3 secret_access_key

0 commit comments

Comments
 (0)