Add S3 related env vars to helm chart

chart/geosphere-mapserver/templates/deployment.yaml

@@ -75,6 +75,28 @@ spec:
               value: "/secrets/postgres-password"
             {{- end }}
             {{- end }}
+            {{- if .Values.imageSource.s3ConfigMap }}
+            - name: "AWS_S3_ENDPOINT"
+              valueFrom:
+                configMapKeyRef:
+                  name: "{{ .Values.imageSource.s3ConfigMap }}"
+                  key: "{{ .Values.imageSource.s3EndpointHostKey }}:{{ .Values.imageSource.s3EndpointPortKey }}"
+            {{- else }}
+            - name: "AWS_S3_ENDPOINT"
+              value: "{{ .Values.imageSource.s3Endpoint }}"
+            {{- end }}
+            {{- if .Values.imageSource.s3Secret }}
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.imageSource.s3Secret }}
+                  key: {{ .Values.imageSource.s3AccessKey}}
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.imageSource.s3Secret }}
+                  key: {{ .Values.imageSource.s3SecretKey}}
+            {{- end }}
           volumeMounts:
             - name: src
               mountPath: "/data"

chart/geosphere-mapserver/values.yaml

@@ -21,8 +21,15 @@ database:
   postgresPasswordSecret: ""
 
 imageSource:
-  # not implemented:
+  s3ConfigMap: ""
+  s3EndpointHostKey: "BUCKET_HOST"
+  s3EndpointPortKey: "BUCKET_PORT"
+  # -- Default endpoint host:port if s3ConfigMap is not specified
   s3Endpoint: ""
+  s3Secret: ""
+  s3AccessKey: "AWS_ACCESS_KEY_ID"
+  s3SecretKey: "AWS_SECRET_ACCESS_KEY"
+  # -- PVC where input geotiffs are stored
   existingClaim: ""
 tileSource:
   # not implemented:

ci/test-postgis-radf-s3-values.yaml

+imageSource:
+  s3ConfigMap: "a-config-map"
+  s3Secret: "a-secret"
+database:
+  postgresHost: "localhost"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "fake-secret"
+ingress:
+  enabled: true
+  annotations:
+   nginx.ingress.kubernetes.io/ssl-redirect: "false"
+  #   ingress.kubernetes.io/ssl-redirect: "true"
+  hosts:
+    - host: test
+      paths:
+        - path: "/wms"
+          pathType: ImplementationSpecific
+    # the test site uses the production WMS server
+#    - host: geosphere-test.ssec.wisc.edu
+#      paths: ["/wms", "/wms_times"]
+  tls:
+    - hosts:
+        - "test"
+      secretName: "test-tls-certs"