From bc08613dbd98c45933a83206b309bdf5362aaa21 Mon Sep 17 00:00:00 2001
From: "Ehsan.Asadi" <ehsan.asadi@zoodfood.com>
Date: Tue, 30 Dec 2025 16:39:44 +0330
Subject: [PATCH] fix(helm): resolve YAML structure issue in env vars

Problem: Mixing toYaml output with inline list items broke YAML structure
  {{- toYaml .Values.env | nindent 12 }}
  - name: API_URL  # This caused parse error

Solution: Define all env vars inline and append .Values.env at the end
using range loop. This creates valid YAML list structure.

Now helm lint and helm template both pass successfully.
---
 helm/peikarband/templates/deployment.yaml | 93 ++++++++++++-----------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/helm/peikarband/templates/deployment.yaml b/helm/peikarband/templates/deployment.yaml
index c5e1dd3..81d69f3 100644
--- a/helm/peikarband/templates/deployment.yaml
+++ b/helm/peikarband/templates/deployment.yaml
@@ -48,51 +48,54 @@ spec:
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         env:
-          {{- toYaml .Values.env | nindent 12 }}
-          - name: API_URL
-            value: {{ .Values.reflex.apiUrl | quote }}
-          - name: FRONTEND_PORT
-            value: {{ .Values.service.frontend.targetPort | quote }}
-          - name: BACKEND_PORT
-            value: {{ .Values.service.backend.targetPort | quote }}
-          {{- if .Values.postgresql.enabled }}
-          - name: DATABASE_HOST
-            value: {{ .Values.postgresql.external.host }}
-          - name: DATABASE_PORT
-            value: {{ .Values.postgresql.external.port | quote }}
-          - name: DATABASE_NAME
-            value: {{ .Values.postgresql.external.database }}
-          - name: DATABASE_USER
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.postgresql.external.usernameSecret.name }}
-                key: {{ .Values.postgresql.external.usernameSecret.key }}
-          - name: DATABASE_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.postgresql.external.passwordSecret.name }}
-                key: {{ .Values.postgresql.external.passwordSecret.key }}
-          - name: DATABASE_URL
-            value: "postgresql://$(DATABASE_USER):$(DATABASE_PASSWORD)@$(DATABASE_HOST):$(DATABASE_PORT)/$(DATABASE_NAME)"
-          {{- end }}
-          {{- if .Values.redis.enabled }}
-          - name: REDIS_HOST
-            value: {{ .Values.redis.external.host }}
-          - name: REDIS_PORT
-            value: {{ .Values.redis.external.port | quote }}
-          {{- if .Values.redis.external.passwordSecret }}
-          - name: REDIS_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.redis.external.passwordSecret.name }}
-                key: {{ .Values.redis.external.passwordSecret.key }}
-          - name: REDIS_URL
-            value: "redis://:$(REDIS_PASSWORD)@$(REDIS_HOST):$(REDIS_PORT)/0"
-          {{- else }}
-          - name: REDIS_URL
-            value: "redis://$(REDIS_HOST):$(REDIS_PORT)/0"
-          {{- end }}
-          {{- end }}
+        - name: API_URL
+          value: {{ .Values.reflex.apiUrl | quote }}
+        - name: FRONTEND_PORT
+          value: {{ .Values.service.frontend.targetPort | quote }}
+        - name: BACKEND_PORT
+          value: {{ .Values.service.backend.targetPort | quote }}
+        {{- if .Values.postgresql.enabled }}
+        - name: DATABASE_HOST
+          value: {{ .Values.postgresql.external.host }}
+        - name: DATABASE_PORT
+          value: {{ .Values.postgresql.external.port | quote }}
+        - name: DATABASE_NAME
+          value: {{ .Values.postgresql.external.database }}
+        - name: DATABASE_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.postgresql.external.usernameSecret.name }}
+              key: {{ .Values.postgresql.external.usernameSecret.key }}
+        - name: DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.postgresql.external.passwordSecret.name }}
+              key: {{ .Values.postgresql.external.passwordSecret.key }}
+        - name: DATABASE_URL
+          value: "postgresql://$(DATABASE_USER):$(DATABASE_PASSWORD)@$(DATABASE_HOST):$(DATABASE_PORT)/$(DATABASE_NAME)"
+        {{- end }}
+        {{- if .Values.redis.enabled }}
+        - name: REDIS_HOST
+          value: {{ .Values.redis.external.host }}
+        - name: REDIS_PORT
+          value: {{ .Values.redis.external.port | quote }}
+        {{- if .Values.redis.external.passwordSecret }}
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.redis.external.passwordSecret.name }}
+              key: {{ .Values.redis.external.passwordSecret.key }}
+        - name: REDIS_URL
+          value: "redis://:$(REDIS_PASSWORD)@$(REDIS_HOST):$(REDIS_PORT)/0"
+        {{- else }}
+        - name: REDIS_URL
+          value: "redis://$(REDIS_HOST):$(REDIS_PORT)/0"
+        {{- end }}
+        {{- end }}
+        {{- range .Values.env }}
+        - name: {{ .name }}
+          value: {{ .value | quote }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: {{ include "peikarband.fullname" . }}