185814b2 by Adam Heath

Try to fix direct url restore.

1 parent 0d6151e4
...@@ -56,18 +56,20 @@ spec: ...@@ -56,18 +56,20 @@ spec:
56 env: 56 env:
57 {{- if .Values.rclone.crypt.enabled }} 57 {{- if .Values.rclone.crypt.enabled }}
58 - name: RCLONE_CRYPT_REMOTE 58 - name: RCLONE_CRYPT_REMOTE
59 {{- else }} 59 {{- if .Values.restore.url }}
60 - name: RCLONE_S3_REMOTE
61 {{- end }}
62 {{- if .Values.restore.url }}
63 value: ":{{ .Values.restore.url }}" 60 value: ":{{ .Values.restore.url }}"
64 {{- else }} 61 {{- else }}
65 value: ":s3:$(S3_BUCKET)/$(S3_PREFIX)/last/" 62 value: ":s3:$(S3_BUCKET)/$(S3_PREFIX)/last/"
63 {{- end }}
66 {{- end }} 64 {{- end }}
67 {{- if .Values.rclone.crypt.enabled }} 65 {{- if .Values.rclone.crypt.enabled }}
68 args: ["copy", ":crypt:", "/restores/.work/"] 66 args: ["copy", ":crypt:", "/restores/.work/"]
69 {{- else }} 67 {{- else }}
70 args: ["-v", "copy", "$(RCLONE_S3_REMOTE)", "/restores/.work/"] 68 {{- if .Values.restore.url }}
69 args: ["-v", "copy", ":s3:{{ .Values.restore.url }}", "/restores/.work/"]
70 {{- else }}
71 args: ["-v", "copy", ":s3:$(S3_BUCKET)/$(S3_PREFIX)/last/", "/restores/.work/"]
72 {{- end }}
71 {{- end }} 73 {{- end }}
72 {{- end }} 74 {{- end }}
73 - name: link-latest 75 - name: link-latest
......