further simplify

Signed-off-by: Steven <[email protected]>
cloudnative-pg · May 29, 2024 · ace35a9 · ace35a9
1 parent c18e3c3
commit ace35a9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/charts/cloudnative-pg/templates/_helpers.tpl b/charts/cloudnative-pg/templates/_helpers.tpl
@@ -60,13 +60,3 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
-
-{{/*
-Renders a value that contains template
-Usage:
-{{ include "cloudnative-pg.extraEnv" ( dict "value" .Values.example.value "context" $ ) }}
-*/}}
-{{- define "cloudnative-pg.extraEnv" -}}
-{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
-{{- tpl $value .context }}
-{{- end -}}
diff --git a/charts/cloudnative-pg/templates/deployment.yaml b/charts/cloudnative-pg/templates/deployment.yaml
@@ -73,7 +73,7 @@ spec:
         - name: MONITORING_QUERIES_CONFIGMAP
           value: "{{ .Values.monitoringQueriesConfigMap.name }}"
         {{- if .Values.additionalEnv }}
-        {{- include "cloudnative-pg.extraEnv" (dict "value" .Values.additionalEnv "context" . ) | nindent 8 }}
+        {{- tpl (.Values.additionalEnvVars | toYaml) . | nindent 8 }}
         {{- end }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}