From 65936002dbf96f09a1368718f7b733887b6af892 Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Mon, 23 Sep 2024 10:56:13 +0200
Subject: [PATCH] Various fixes

---
 templates/job-assets-copy.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/job-assets-copy.yaml b/templates/job-assets-copy.yaml
index 3286349..c187796 100644
--- a/templates/job-assets-copy.yaml
+++ b/templates/job-assets-copy.yaml
@@ -21,7 +21,8 @@ spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
-      {{- end }}      volumes:
+      {{- end }}
+      volumes:
       restartPolicy: Never
       initContainers:
         - name: extract-assets
@@ -48,23 +49,23 @@ spec:
           - name: RCLONE_CONFIG_REMOTE_PROVIDER
             value: AWS
           - 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
             valueFrom:
               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 }}
           - name: RCLONE_CONFIG_REMOTE_SECRET_ACCESS_KEY
             valueFrom:
               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 }}
           command:
           - rclone
           args:
           - copy
           - /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
           - -vv
           volumeMounts:
@@ -76,6 +77,7 @@ spec:
               memory: 256Mi
             limits:
               memory: 500Mi
+      volumes:
         - name: assets
           emptyDir: {}
 {{- end -}}