diff --git a/charts/sigi/v0/Chart.yaml b/charts/sigi/v0/Chart.yaml index df711fc..ac02ab4 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.3 +version: 0.1.4 # 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/questions.yaml b/charts/sigi/v0/questions.yaml index 04ba651..500ca2b 100644 --- a/charts/sigi/v0/questions.yaml +++ b/charts/sigi/v0/questions.yaml @@ -14,22 +14,6 @@ questions: group: Básico required: true -# Informações Autenticação -- variable: sigi.auth.ldap.userAttrMap - default: {"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", 'is_staff': "cn",} - description: "Mapa atributos usuário LDAP" - label: Mapa atributos usuário LDAP" - type: string - group: Autenticação - required: true -- variable: sigi.auth.ldap.profileAttrMap - default: {"nome_completo": "cn"} - description: "Mapa de atributos profile LDAP" - label: Mapa atributos profile LDAP" - type: string - group: Autenticação - required: true - # Ingress - variable: ingress.tls.enabled diff --git a/charts/sigi/v0/templates/deployment.yaml b/charts/sigi/v0/templates/deployment.yaml index b4e0f1b..39c703e 100644 --- a/charts/sigi/v0/templates/deployment.yaml +++ b/charts/sigi/v0/templates/deployment.yaml @@ -68,9 +68,15 @@ spec: - name: AUTH_LDAP_GROUP_TYPE_STRING value: "{{ .Values.sigi.auth.ldap.groupTypeString }}" - name: AUTH_LDAP_USER_ATTR_MAP - value: "{{ .Values.sigi.auth.ldap.userAttrMap }}" + valueFrom: + configMapKeyRef: + name: auth-ldap + key: AUTH_LDAP_USER_ATTR_MAP - name: AUTH_LDAP_PROFILE_ATTR_MAP - value: "{{ .Values.sigi.auth.ldap.profileAttrMap }}" + valueFrom: + configMapKeyRef: + name: auth-ldap + key: AUTH_LDAP_PROFILE_ATTR_MAP - name: AUTH_LDAP_FIND_GROUP_PERMS value: "{{ .Values.sigi.auth.ldap.findGroupPerms }}" - name: AUTH_LDAP_MIRROR_GROUPS diff --git a/charts/sigi/v0/values.yaml b/charts/sigi/v0/values.yaml index ce760fb..c876025 100644 --- a/charts/sigi/v0/values.yaml +++ b/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