From 543773eb5764122e85c1b27a7877c15d5a7fa849 Mon Sep 17 00:00:00 2001
From: Keny Villela <keny@interlegis.leg.br>
Date: Tue, 13 Sep 2022 11:07:28 -0300
Subject: [PATCH] SIGI helm v0.1.5

---
 charts/sigi/v0/Chart.yaml                |  2 +-
 charts/sigi/v0/templates/deployment.yaml | 84 ++++++++++++++++++------
 2 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/charts/sigi/v0/Chart.yaml b/charts/sigi/v0/Chart.yaml
index ac02ab4..f9e026b 100644
--- a/charts/sigi/v0/Chart.yaml
+++ b/charts/sigi/v0/Chart.yaml
@@ -8,7 +8,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
+version: 0.1.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/sigi/v0/templates/deployment.yaml b/charts/sigi/v0/templates/deployment.yaml
index 39c703e..3b2f17b 100644
--- a/charts/sigi/v0/templates/deployment.yaml
+++ b/charts/sigi/v0/templates/deployment.yaml
@@ -46,47 +46,93 @@ spec:
             - name: DATABASE_URL
               value: {{ printf "postgresql://%s:%s@%s:5432/%s" .Values.postgresql.auth.username .Values.postgresql.auth.password (include "postgresql.fullname" .) .Values.postgresql.auth.database| quote }}
             - name: EMAIL_PORT
-              value: "{{ .Values.sigi.emailPort }}"
+                configMapKeyRef: 
+                  name: sigi-email 
+                  key: EMAIL_PORT
             - name: EMAIL_HOST
-              value: "{{ .Values.sigi.emailHost }}"
+                configMapKeyRef: 
+                  name: sigi-email 
+                  key: EMAIL_HOST
             - name: DEFAULT_FROM_EMAIL
-              value: "{{ .Values.sigi.defaultFromEmail }}"
+                configMapKeyRef: 
+                  name: sigi-email 
+                  key: DEFAULT_FROM_EMAIL
             - name: AUTH_LDAP_SERVER_URI
-              value: "{{ .Values.sigi.auth.ldap.serverURI }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_SERVER_URI
             - name: AUTH_LDAP_BIND_DN
-              value: "{{ .Values.sigi.auth.ldap.bindDN }}"
-            - name: AUTH_LDAP_BIND_PASSWORD
-              value: "{{ .Values.sigi.auth.ldap.bindPwd }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_BIND_DN
             - name: AUTH_LDAP_USER
-              value: "{{ .Values.sigi.auth.ldap.user }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_USER
             - name: AUTH_LDAP_USER_SEARCH_STRING
-              value: "{{ .Values.sigi.auth.ldap.userSearchString }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_USER_SEARCH_STRING
             - name: AUTH_LDAP_GROUP
-              value: "{{ .Values.sigi.auth.ldap.group }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_GROUP
             - name: AUTH_LDAP_GROUP_SEARCH_STRING
-              value: "{{ .Values.sigi.auth.ldap.groupSearchString }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_GROUP_SEARCH_STRING
             - name: AUTH_LDAP_GROUP_TYPE_STRING
-              value: "{{ .Values.sigi.auth.ldap.groupTypeString }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_GROUP_TYPE_STRING
             - name: AUTH_LDAP_USER_ATTR_MAP
               valueFrom: 
                 configMapKeyRef: 
-                  name: auth-ldap 
+                  name: sigi-auth-ldap 
                   key: AUTH_LDAP_USER_ATTR_MAP
             - name: AUTH_LDAP_PROFILE_ATTR_MAP
               valueFrom: 
                 configMapKeyRef: 
-                  name: auth-ldap 
+                  name: sigi-auth-ldap 
                   key: AUTH_LDAP_PROFILE_ATTR_MAP
             - name: AUTH_LDAP_FIND_GROUP_PERMS
-              value: "{{ .Values.sigi.auth.ldap.findGroupPerms }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_FIND_GROUP_PERMS
             - name: AUTH_LDAP_MIRROR_GROUPS
-              value: "{{ .Values.sigi.auth.ldap.mirrorGroups }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_MIRROR_GROUPS
             - name: AUTH_LDAP_CACHE_GROUPS
-              value: "{{ .Values.sigi.auth.ldap.cacheGroups }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_CACHE_GROUPS
             - name: AUTH_LDAP_GROUP_CACHE_TIMEOUT
-              value: "{{ .Values.sigi.auth.ldap.groupCacheTimeout }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_GROUP_CACHE_TIMEOUT
             - name: AUTH_PROFILE_MODULE
-              value: "{{ .Values.sigi.auth.profileModule }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_PROFILE_MODULE
+            - name: AUTH_LDAP_BIND_PASSWORD
+              valueFrom: 
+                # Secret Key
+                secretKeyRef: 
+                  name: sigi-auth-ldap-key
+                  key: AUTH_LDAP_BIND_PASSWORD
           volumeMounts:
 #            - mountPath: /var/interlegis/sigi/data
 #              name: data