Merge branch 'master' of https://git.interlegis.leg.br/SEIT/rancher-charts

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.2
+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

charts/sigi/v0/templates/deployment.yaml

@@ -46,41 +46,96 @@ 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 }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-email 
+                  key: EMAIL_PORT
             - name: EMAIL_HOST
-              value: "{{ .Values.sigi.emailHost }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-email 
+                  key: EMAIL_HOST
             - name: DEFAULT_FROM_EMAIL
-              value: "{{ .Values.sigi.defaultFromEmail }}"
+              valueFrom: 
+                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
-              value: "{{ .Values.sigi.auth.ldap.userAttrMap }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-auth-ldap 
+                  key: AUTH_LDAP_USER_ATTR_MAP
             - name: AUTH_LDAP_PROFILE_ATTR_MAP
-              value: "{{ .Values.sigi.auth.ldap.profileAttrMap }}"
+              valueFrom: 
+                configMapKeyRef: 
+                  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

charts/sigi/v0/values.yaml

@@ -65,10 +65,6 @@ sigi:
       group: 'OU=GruposAutomaticosOU,DC=senado,DC=gov,DC=br'
       groupSearchString: '(objectClass=Group)'
       groupTypeString: 'cn'
-#      userAttrMap: {"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", 'is_staff': "cn",}
-      userAttrMap: ''
-#      profileAttrMap: {"nome_completo": "cn"}
-      profileAttrMap: ''
       findGroupPerms: True
       mirrorGroups: True
       cacheGroups: True