Merge branch 'master' into 'master'
env.normal should override chart defined variables See merge request burke-software/django-helm-chart!5
This commit is contained in:
		
						commit
						e55c49432c
					
				
					 1 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -7,12 +7,12 @@ metadata:
 | 
			
		|||
  annotations:
 | 
			
		||||
    "helm.sh/hook-weight": "-1"
 | 
			
		||||
data:
 | 
			
		||||
{{- range $k, $v := .Values.env.normal }}
 | 
			
		||||
  {{ $k }}: {{ $v | quote }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- if .Values.postgresql.enabled }}
 | 
			
		||||
  DATABASE_HOST: {{ include "django.postgresql.host" . | quote }}
 | 
			
		||||
  DATABASE_USER: {{ include "django.postgresql.username" . | quote }}
 | 
			
		||||
  DATABASE_NAME: {{ include "django.postgresql.name" . | quote }}
 | 
			
		||||
  DATABASE_PORT: {{ include "django.postgresql.port" . | quote }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- range $k, $v := .Values.env.normal }}
 | 
			
		||||
  {{ $k }}: {{ $v | quote }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue