env.normal should override chart defined variables
This commit is contained in:
parent
d53f3f209d
commit
c50bfb5650
|
@ -7,12 +7,12 @@ metadata:
|
||||||
annotations:
|
annotations:
|
||||||
"helm.sh/hook-weight": "-1"
|
"helm.sh/hook-weight": "-1"
|
||||||
data:
|
data:
|
||||||
{{- range $k, $v := .Values.env.normal }}
|
|
||||||
{{ $k }}: {{ $v | quote }}
|
|
||||||
{{- end }}
|
|
||||||
{{- if .Values.postgresql.enabled }}
|
{{- if .Values.postgresql.enabled }}
|
||||||
DATABASE_HOST: {{ include "django.postgresql.host" . | quote }}
|
DATABASE_HOST: {{ include "django.postgresql.host" . | quote }}
|
||||||
DATABASE_USER: {{ include "django.postgresql.username" . | quote }}
|
DATABASE_USER: {{ include "django.postgresql.username" . | quote }}
|
||||||
DATABASE_NAME: {{ include "django.postgresql.name" . | quote }}
|
DATABASE_NAME: {{ include "django.postgresql.name" . | quote }}
|
||||||
DATABASE_PORT: {{ include "django.postgresql.port" . | quote }}
|
DATABASE_PORT: {{ include "django.postgresql.port" . | quote }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- range $k, $v := .Values.env.normal }}
|
||||||
|
{{ $k }}: {{ $v | quote }}
|
||||||
|
{{- end }}
|
||||||
|
|
Loading…
Reference in a new issue