KuroNET/django-helm-chart
Archived
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
env.normal should override chart defined variables

See merge request burke-software/django-helm-chart!5
This commit is contained in:
David Burke 2022-07-21 14:15:44 +00:00
commit e55c49432c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
templates/configmap.yaml
View file

@ -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 }}