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

charts/sapl/v0.2.0/Chart.yaml

@@ -13,7 +13,7 @@ version: 0.2.0
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 3.1.163-RC6
+appVersion: 3.1.163-RC8
 
 icon: https://git.interlegis.leg.br/SEIT/rancher-charts/raw/master/images/sapl.png
 

charts/sigi/k8sfiles/sigi-configmap.yaml

@@ -0,0 +1,46 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sigi-email
+  namespace: sigi
+data:
+  ADMINS: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)"
+  EMAIL_PORT: "25"
+  EMAIL_HOST: smtp.interlegis.leg.br
+  DEFAULT_FROM_EMAIL: sigi@interlegis.leg.br
+    
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: sigi-auth-ldap-key
+  namespace: sigi
+type: Opaque
+data:
+  AUTH_LDAP_BIND_PASSWORD: YWx0ZXJlbWU=
+# AUTH_LDAP_BIND_PASSWORD: altereme
+
+---    
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sigi-auth-ldap
+  namespace: sigi
+data:
+  AUTH_LDAP_BIND_DN: CN=Sistema de Informações Gerenciais do Interlegis Service Account,OU=_UsuariosServicos,OU=2-AdministracaoSistemas,DC=senado,DC=gov,DC=br
+  AUTH_LDAP_CACHE_GROUPS: "False"
+  AUTH_LDAP_FIND_GROUP_PERMS: "False"
+  AUTH_LDAP_GROUP: ""
+  AUTH_LDAP_GROUP_CACHE_TIMEOUT: "0"
+  AUTH_LDAP_GROUP_SEARCH_STRING: ""
+  AUTH_LDAP_GROUP_TYPE_STRING: ""
+  AUTH_LDAP_MIRROR_GROUPS: "False"
+  AUTH_LDAP_PROFILE_ATTR_MAP: '{"nome_completo": "cn"}'
+  AUTH_LDAP_SERVER_URI: ldap://ad.senado.gov.br
+  AUTH_LDAP_USER: OU=UsuariosPessoas,DC=senado,DC=gov,DC=br
+  AUTH_LDAP_USER_ATTR_MAP: '{"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", }'
+  AUTH_LDAP_USER_SEARCH_STRING: (&(sAMAccountName=%(user)s)(department=*ILB*)(!(title=*Desligad*))(!(title=*inativ*)))
+  AUTH_PROFILE_MODULE: servidores.Servidor
+
+
+

charts/sigi/v0.2/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.2.0
+version: 0.2.1
 
 # 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.2/templates/deployment.yaml

@@ -45,6 +45,11 @@ spec:
               value: "{{ .Values.sigi.language }}"
             - 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: ADMINS
+              valueFrom: 
+                configMapKeyRef: 
+                  name: sigi-email 
+                  key: ADMINS
             - name: EMAIL_PORT
               valueFrom: 
                 configMapKeyRef: