fix: change template behaviour on env

Signed-off-by: andreibe <[email protected]>
dragonflydb · Nov 26, 2024 · 6f4cd43 · 6f4cd43
1 parent dedad5f
commit 6f4cd43
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/contrib/charts/dragonfly/templates/_pod.tpl b/contrib/charts/dragonfly/templates/_pod.tpl
@@ -96,14 +96,15 @@ containers:
       {{- toYaml . | trim | nindent 6 }}
     {{- end }}
     {{- include "dragonfly.volumemounts" . | trim | nindent 4 }}
+    {{- if or .Values.passwordFromSecret.enable .Values.env }}
+    env:
     {{- if .Values.passwordFromSecret.enable }}
     {{- $appVersion := .Chart.AppVersion | trimPrefix "v" }}
     {{- $imageTag := .Values.image.tag | trimPrefix "v" }}
     {{- $effectiveVersion := $appVersion }}
     {{- if and $imageTag (ne $imageTag "") }}
       {{- $effectiveVersion = $imageTag }}
     {{- end }}
-    env:
     {{- if semverCompare ">=1.14.0" $effectiveVersion }}
       - name: DFLY_requirepass
     {{- else }}
@@ -117,6 +118,7 @@ containers:
     {{- with .Values.env }}
       {{- toYaml . | trim | nindent 6 }}
     {{- end }}
+    {{- end }}
     {{- with .Values.envFrom }}
     envFrom:
       {{- toYaml . | trim | nindent 6 }}