From 1bf0fb3c922da6c6302baaad3f5cba6cbecc49f8 Mon Sep 17 00:00:00 2001
From: Yosef Mihretie <mihretiey@gmail.com>
Date: Fri, 20 Dec 2024 13:02:06 -0500
Subject: [PATCH] overrides

---
 applications/worker/templates/deployment.yaml | 12 +++++++-----
 applications/worker/values.yaml               |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/applications/worker/templates/deployment.yaml b/applications/worker/templates/deployment.yaml
index 02190f90..af6a34a6 100644
--- a/applications/worker/templates/deployment.yaml
+++ b/applications/worker/templates/deployment.yaml
@@ -332,11 +332,11 @@ spec:
           {{ end }}
           {{ end }}
           {{ if .Values.additionalVolumes }}
-          {{ range .Values.additionalVolumes }}
           volumeMounts:
+            {{- range .Values.additionalVolumes }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
-          {{ end }}
+            {{- end }}
           {{ end }}
         {{- if .Values.cloudsql.enabled }}
         - name: cloud-sql-proxy
@@ -405,7 +405,7 @@ spec:
               {{- end }}
           {{- end }}
       {{ end }}
-      {{ if or .Values.pvc.enabled .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.datadogSocketVolume.enabled .Values.fileSecretMounts.enabled .Values.additionalVolumes (len .Values.additionalVolumes | gt 0) }}
+      {{ 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:
@@ -439,9 +439,11 @@ spec:
             secretName: "{{ .secretName }}"
         {{ end }}
         {{ end }}
-        {{ range .Values.additionalVolumes }}
+        {{ if .Values.additionalVolumes }}
+        {{- range .Values.additionalVolumes }}
         - name: {{ .name }}
           {{ .type }}:
-            {{- toYaml .volumeOptions | nindent 8 }}
+            {{- toYaml .volumeOptions | nindent 12 }}
+        {{- end }}
         {{ end }}
       {{ end }}
diff --git a/applications/worker/values.yaml b/applications/worker/values.yaml
index 6b356b1a..3b24e252 100644
--- a/applications/worker/values.yaml
+++ b/applications/worker/values.yaml
@@ -181,7 +181,7 @@ fileSecretMounts:
 
 # set this to add additional volumes to the deployment
 additionalVolumes:
-  - name: ""
-    type: ""
-    mountPath: ""
-    volumeOptions: {}
+  # - name: ""
+  #   type: ""
+  #   mountPath: ""
+  #   volumeOptions: {}