mirror of
https://github.com/mastodon/chart
synced 2025-05-18 04:53:21 +00:00
Various fixes
This commit is contained in:
parent
6e2cf1ab50
commit
65936002db
|
@ -21,7 +21,8 @@ spec:
|
||||||
{{- with .Values.imagePullSecrets }}
|
{{- with .Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }} volumes:
|
{{- end }}
|
||||||
|
volumes:
|
||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: extract-assets
|
- name: extract-assets
|
||||||
|
@ -48,23 +49,23 @@ spec:
|
||||||
- name: RCLONE_CONFIG_REMOTE_PROVIDER
|
- name: RCLONE_CONFIG_REMOTE_PROVIDER
|
||||||
value: AWS
|
value: AWS
|
||||||
- name: RCLONE_CONFIG_REMOTE_ENDPOINT
|
- name: RCLONE_CONFIG_REMOTE_ENDPOINT
|
||||||
value: {{ .Values.mastodon.hooks.s3Upload.endpoint }}
|
value: {{ required "Please specify an endpoint for S3 asset uploads" .Values.mastodon.hooks.s3Upload.endpoint }}
|
||||||
- name: RCLONE_CONFIG_REMOTE_ACCESS_KEY_ID
|
- name: RCLONE_CONFIG_REMOTE_ACCESS_KEY_ID
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ .Values.mastodon.hooks.s3Upload.secretRef.name }}
|
name: {{ required "Please specify a secret with S3 credentials for S3 asset uploads" .Values.mastodon.hooks.s3Upload.secretRef.name }}
|
||||||
key: {{ .Values.mastodon.hooks.s3Upload.secretRef.keys.accesKeyId }}
|
key: {{ .Values.mastodon.hooks.s3Upload.secretRef.keys.accesKeyId }}
|
||||||
- name: RCLONE_CONFIG_REMOTE_SECRET_ACCESS_KEY
|
- name: RCLONE_CONFIG_REMOTE_SECRET_ACCESS_KEY
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ .Values.mastodon.hooks.s3Upload.secretRef.name }}
|
name: {{ required "Please specify a secret with S3 credentials for S3 asset uploads" .Values.mastodon.hooks.s3Upload.secretRef.name }}
|
||||||
key: {{ .Values.mastodon.hooks.s3Upload.secretRef.keys.secretAccessKey }}
|
key: {{ .Values.mastodon.hooks.s3Upload.secretRef.keys.secretAccessKey }}
|
||||||
command:
|
command:
|
||||||
- rclone
|
- rclone
|
||||||
args:
|
args:
|
||||||
- copy
|
- copy
|
||||||
- /assets/public
|
- /assets/public
|
||||||
- exo # defined in the env variable name above
|
- "remote:{{ required "Please specify a bucket for S3 asset uploads" .Values.mastodon.hooks.s3Upload.bucket }}"
|
||||||
- --progress
|
- --progress
|
||||||
- -vv
|
- -vv
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -76,6 +77,7 @@ spec:
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
limits:
|
limits:
|
||||||
memory: 500Mi
|
memory: 500Mi
|
||||||
|
volumes:
|
||||||
- name: assets
|
- name: assets
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user