Merge pull request #1460 from porter-dev/main

Move additional volumes for workers to prod

Author: yosefmih

applications/worker/templates/deployment.yaml

@@ -331,6 +331,13 @@ spec:
               readOnly: true
           {{ end }}
           {{ end }}
+          {{ if .Values.additionalVolumes }}
+          volumeMounts:
+            {{- range .Values.additionalVolumes }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+            {{- end }}
+          {{ end }}
         {{- if .Values.cloudsql.enabled }}
         - name: cloud-sql-proxy
           image: gcr.io/cloudsql-docker/gce-proxy:1.17
@@ -398,7 +405,7 @@ spec:
               {{- end }}
           {{- end }}
       {{ end }}
-      {{ if or .Values.pvc.enabled .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.datadogSocketVolume.enabled .Values.fileSecretMounts.enabled }}
+      {{ if or .Values.pvc.enabled .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.datadogSocketVolume.enabled .Values.fileSecretMounts.enabled (and .Values.additionalVolumes (not (empty .Values.additionalVolumes))) }}
       volumes:
         {{ if .Values.datadogSocketVolume.enabled }}
         - hostPath:
@@ -432,4 +439,11 @@ spec:
             secretName: "{{ .secretName }}"
         {{ end }}
         {{ end }}
+        {{ if .Values.additionalVolumes }}
+        {{- range .Values.additionalVolumes }}
+        - name: {{ .name }}
+          {{ .type }}:
+            {{- toYaml .volumeOptions | nindent 12 }}
+        {{- end }}
+        {{ end }}
       {{ end }}

applications/worker/values.yaml

@@ -177,4 +177,11 @@ nodeGroups: []
 # Format: fileSecretMounts: [{secretName: <SECRET_NAME>, mountPath: <MOUNT_PATH>},..]
 fileSecretMounts:
   enabled: false
-  mounts: []
+  mounts: []
+
+# set this to add additional volumes to the deployment
+additionalVolumes:
+  # - name: ""
+  #   type: ""
+  #   mountPath: ""
+  #   volumeOptions: {}