ref: refactor env rendering to use common helper function

charts/signoz/templates/_helpers.tpl

@@ -740,3 +740,30 @@ imagePullSecrets:
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/*
+Function to render environment variables 
+*/}}
+{{- define "common.renderAdditionalEnv" -}}
+{{- $dict := . -}}
+{{- $processedKeys := dict -}}
+{{- range keys . | sortAlpha }}
+{{- $val := pluck . $dict | first -}}
+{{- $key := upper . -}}
+{{- if not (hasKey $processedKeys $key) }}
+{{- $processedKeys = merge $processedKeys (dict $key true) -}}
+{{- $valueType := printf "%T" $val -}}
+{{- if eq $valueType "map[string]interface {}" }}
+- name: {{ $key }}
+{{ toYaml $val | indent 2 -}}
+{{- else if eq $valueType "string" }}
+- name: {{ $key }}
+  value: {{ $val | quote }}
+{{- else }}
+- name: {{ $key }}
+  value: {{ $val | quote }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+

charts/signoz/templates/query-service/statefulset.yaml

@@ -138,19 +138,7 @@ spec:
               value: {{ quote .Values.queryService.configVars.telemetryEnabled }}
             - name: DEPLOYMENT_TYPE
               value: {{ .Values.queryService.configVars.deploymentType }}
-            {{- range $key, $val := .Values.queryService.additionalEnvs }}
-            - name: {{ $key }}
-              {{- if kindIs "map" $val }}
-              {{- if $val.value}}
-              value: {{ $val.value | quote }}
-              {{- end}}
-              {{- if $val.valueFrom }}
-              valueFrom: {{ toYaml $val.valueFrom | nindent 16 }}
-              {{- end}}
-              {{- else }}
-              value: {{ $val | quote }}
-              {{- end}}
-            {{- end }}
+            {{- include "common.renderAdditionalEnv" .Values.queryService.additionalEnvs | nindent 12 }}
             {{- if .Values.queryService.smtpVars.enabled }}
             - name: SMTP_ENABLED
               value: "true"