Adds S3 storage configuration to Helm chart (#1272)

* Adds S3 configuration to Helm chart

* fix typos and bump version

charts/athens-proxy/Chart.yaml

@@ -1,5 +1,5 @@
 name: athens-proxy
-version: 0.2.10
+version: 0.2.11
 appVersion: 0.4.0
 description: The proxy server for Go modules
 icon: https://raw.githubusercontent.com/gomods/athens/master/docs/static/banner.png

charts/athens-proxy/templates/deployment.yaml

@@ -72,6 +72,25 @@ spec:
         {{- else if eq .Values.storage.type "mongo"}}
         - name: ATHENS_MONGO_STORAGE_URL
           value: {{ .Values.storage.mongo.url | quote }}
+        {{- else if eq .Values.storage.type "s3" }}
+        - name: AWS_REGION
+          value: {{ .Values.storage.s3.region | quote }}
+        - name: ATHENS_S3_BUCKET_NAME
+          value: {{ .Values.storage.s3.bucket | quote }}
+        - name: AWS_USE_DEFAULT_CONFIGURATION
+          value: {{ .Values.storage.s3.useDefaultConfiguration | quote }}
+        {{- if .Values.storage.s3.access_key_id }}
+        - name: AWS_ACCESS_KEY_ID
+          value: {{ .Values.storage.s3.access_key_id | quote }}
+        {{- end }}
+        {{- if .Values.storage.s3.secret_access_key }}
+        - name: AWS_SECRET_ACCESS_KEY
+          value: {{ .Values.storage.s3.secret_access_key | quote }}
+        {{- end }}
+        {{- if .Values.storage.s3.session_token }}
+        - name: AWS_SESSION_TOKEN
+          value: {{ .Values.storage.s3.session_token | quote }}
+        {{- end }}
         {{- end }}
         {{- if .Values.netrc.enabled }}
         - name: ATHENS_NETRC_PATH
@@ -121,7 +140,7 @@ spec:
       volumes:
       - name: storage-volume
       {{- if .Values.storage.disk.persistence.enabled }}
-        persistentVolumeClaim: 
+        persistentVolumeClaim:
           claimName: {{ template "fullname" . }}-storage
       {{- else }}
         emptyDir: {}

charts/athens-proxy/values.yaml

@@ -44,6 +44,11 @@ storage:
     # you must set this on the command line when you run 'helm install'
     # for example, you need to run 'helm install --set storage.mongo.url=myurl ...'
     url: "SET THIS ON THE COMMAND LINE"
+  s3:
+    # you must set s3 bucket and region when running 'helm install'
+    region: ""
+    bucket: ""
+    useDefaultConfiguration: true
 
 # Extra environment variables to be passed
 # Commented lines below, show how to set username/password for basic auth