From c50bfb56500bca7b358eddf6ad8cbd7d2bc7f259 Mon Sep 17 00:00:00 2001
From: martin milon <martin.milon@ensc.fr>
Date: Thu, 21 Jul 2022 14:15:43 +0000
Subject: [PATCH] env.normal should override chart defined variables

---
 templates/configmap.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index 0e42d8c..dfd246e 100644
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -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 }}