diff --git a/charts/sigi/v0.2.2/Chart.yaml b/charts/sigi/v0.2.2/Chart.yaml index e0c010d..63a8ef2 100644 --- a/charts/sigi/v0.2.2/Chart.yaml +++ b/charts/sigi/v0.2.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.2 +version: 0.2.2-x # 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.2.3/Chart.yaml b/charts/sigi/v0.2.3/Chart.yaml index abc7f85..5538141 100644 --- a/charts/sigi/v0.2.3/Chart.yaml +++ b/charts/sigi/v0.2.3/Chart.yaml @@ -13,7 +13,7 @@ version: 0.2.3 # 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.0.38 +appVersion: 3.0.39 icon: https://git.interlegis.leg.br/SEIT/rancher-charts/raw/master/images/sigi_interlegis.png diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index ae15bd9..3ed4642 100644 --- a/charts/sigi/v0.2.3/questions.yaml +++ b/charts/sigi/v0.2.3/questions.yaml @@ -14,6 +14,119 @@ questions: group: Básico required: true +# Correio +- variable: sigi.emailAdmins + default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" + description: "Administrador email SIGI" + label: "ADMINS" + type: string + group: Correio + required: false +- variable: sigi.defaultFromEmail + default: "sigi@interlegis.leg.br" + description: "Remetente padrão do email" + label: "DEFAULT_FROM_EMAIL" + type: string + group: Correio + required: false +# - variable: sigi.useTls +# default: "False" +# description: "Usar TLS ao conectar no servidor SMTP?" +# label: "Usar TLS" +# type: enum +# group: Correio +# options: +# - "True" +# - "False" +# required: false +- variable: sigi.emailPort + default: 25 + description: "Porta de envio de E-mail (SMTP)" + type: int + label: "EMAIL_PORT" + required: false + group: Correio +- variable: sigi.emailHost + default: "smtp.interlegis.leg.br" + description: "Servidor de envio de e-mail (SMTP)" + label: "EMAIL_HOST" + type: string + group: Correio + required: false + +# ldap auth +- variable: sigi.auth.ldap.serverURI + default: '' + description: "Servidor autenticação ldap" + label: "AUTH_LDAP_SERVER_URI" + type: string + group: LDAP + required: true +- variable: sigi.auth.ldap.bindDN + default: '' + description: "Bind de autenticação ldap" + label: "AUTH_LDAP_BIND_DN" + type: string + group: LDAP + required: true +- variable: sigi.auth.ldap.bindPwd + default: '' + description: "Autenticação do Bind no ldap" + label: "AUTH_LDAP_BIND_PASSWORD" + type: string + group: LDAP + required: true +- variable: sigi.auth.ldap.user + default: '' + description: "OU de Usuário no ldap" + label: "AUTH_LDAP_USER" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userSearchString + default: '' + description: "Query de pesquisa de Usuários no ldap" + label: "AUTH_LDAP_USER_SEARCH_STRING" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userAttrMap + default: '' + description: "Atributos do Usuário no ldap" + label: "AUTH_LDAP_USER_ATTR_MAP" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.profileAttrMap + default: '' + description: "Atributos do perfil do Usuário no ldap" + label: "AUTH_LDAP_PROFILE_ATTR_MAP" + type: string + group: LDAP + required: false +- variable: sigi.auth.profileModule + default: '' + description: "Módulo do perfil do Usuário no ldap" + label: "AUTH_PROFILE_MODULE" + type: string + group: LDAP + required: false + +# Saberes +- variable: sigi.saberes.moodleUrl + default: '' + description: "Servidor moodle saberes" + label: "MOODLE_BASE_URL" + type: string + group: Saberes + required: false +- variable: sigi.saberes.moodleToken + default: '' + description: "Token conexão Saberes" + label: "MOODLE_API_TOKEN" + type: string + group: Saberes + required: false # Ingress - variable: ingress.tls.enabled @@ -36,7 +149,6 @@ questions: - letsencrypt - letsencrypt-hml - aws - - variable: ingress.class default: nginx type: enum @@ -48,39 +160,6 @@ questions: - nginx - alb -## Correio -#- variable: sigi.emailSendUser -# default: "sigi@interlegis.leg.br" -# description: "Remetente dos e-mails enviados pelo SIGI" -# label: "Remetente" -# type: string -# group: Correio -# required: false -#- variable: sigi.useTls -# default: "False" -# description: "Usar TLS ao conectar no servidor SMTP?" -# label: "Usar TLS" -# type: enum -# group: Correio -# options: -# - "True" -# - "False" -# required: false -#- variable: sigi.emailPort -# default: 25 -# description: "Porta de envio de E-mail (SMTP)" -# type: int -# label: "Porta SMTP" -# required: false -# group: Correio -#- variable: sigi.emailHost -# default: "smtp.interlegis.leg.br" -# description: "Servidor de envio de e-mail (SMTP)" -# label: "Servidor SMTP" -# type: string -# group: Correio -# required: false - ## PostgreSQL #- variable: postgresql.internal # default: true diff --git a/charts/sigi/v0.2.3/templates/deployment.yaml b/charts/sigi/v0.2.3/templates/deployment.yaml index cedb5a5..b6f8321 100644 --- a/charts/sigi/v0.2.3/templates/deployment.yaml +++ b/charts/sigi/v0.2.3/templates/deployment.yaml @@ -60,11 +60,12 @@ spec: - name: AUTH_LDAP_USER value: "{{ .Values.sigi.auth.ldap.user }}" - name: AUTH_LDAP_BIND_PASSWORD - valueFrom: - # Secret Key - secretKeyRef: - name: {{ include "sigi.fullname" . }}-auth-ldap-key - key: AUTH_LDAP_BIND_PASSWORD + value: "{{ .Values.sigi.auth.ldap.bindPwd }}" + # valueFrom: + # # Secret Key + # secretKeyRef: + # name: {{ include "sigi.fullname" . }}-auth-ldap-key + # key: AUTH_LDAP_BIND_PASSWORD - name: AUTH_LDAP_USER_SEARCH_STRING value: "{{ .Values.sigi.auth.ldap.userSearchString }}" - name: AUTH_LDAP_USER_ATTR_MAP @@ -90,11 +91,12 @@ spec: - name: MOODLE_BASE_URL value: "{{ .Values.sigi.saberes.moodleUrl }}" - name: MOODLE_API_TOKEN - valueFrom: - # Secret Key - secretKeyRef: - name: {{ include "sigi.fullname" . }}-saberes-tkn - key: MOODLE_API_TOKEN + value: "{{ .Values.sigi.saberes.moodleToken }}" + # valueFrom: + # # Secret Key + # secretKeyRef: + # name: {{ include "sigi.fullname" . }}-saberes-tkn + # key: MOODLE_API_TOKEN volumeMounts: # - mountPath: /var/interlegis/sigi/data # name: data diff --git a/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml b/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml deleted file mode 100644 index 2f88242..0000000 --- a/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "sigi.fullname" . }}-auth-ldap-key - labels: - {{- include "sigi.labels" . | nindent 4 }} -type: Opaque -data: - AUTH_LDAP_BIND_PASSWORD: {{ .Values.sigi.auth.ldap.bindPwd | b64enc }} - diff --git a/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml b/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml deleted file mode 100644 index 009d224..0000000 --- a/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "sigi.fullname" . }}-saberes-tkn - labels: - {{- include "sigi.labels" . | nindent 4 }} -type: Opaque -data: - MOODLE_API_TOKEN: {{ .Values.sigi.saberes.moodleToken | b64enc }} - diff --git a/charts/sigi/v0.2.3/values.yaml b/charts/sigi/v0.2.3/values.yaml index a8f4e81..28438b3 100644 --- a/charts/sigi/v0.2.3/values.yaml +++ b/charts/sigi/v0.2.3/values.yaml @@ -58,12 +58,12 @@ sigi: defaultFromEmail: 'sigi@interlegis.leg.br' auth: ldap: - serverURI: 'ldap://ad.senado.gov.br' - bindDN: 'CN=Sistema de Informações Gerenciais do Interlegis Service Account,OU=_UsuariosServicos,OU=2-AdministracaoSistemas,DC=senado,DC=gov,DC=br' - bindPwd: 'RgtJdtvas7s4BSpjnVnR' - user: 'U=UsuariosPessoas,DC=senado,DC=gov,DC=br' - userSearchString: '(&(sAMAccountName=%(user)s)(department=*ILB*)(!(title=*Desligad*))(!(title=*inativ*)))' - userAttrMap: '{"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", }' + serverURI: '' + bindDN: '' + bindPwd: '' + user: '' + userSearchString: '' + userAttrMap: '' group: '' groupSearchString: '' groupTypeString: '' @@ -71,11 +71,11 @@ sigi: mirrorGroups: False cacheGroups: False groupCacheTimeout: 0 - profileAttrMap: '{"nome_completo": "cn"}' - profileModule: 'servidores.Servidor' + profileAttrMap: '' + profileModule: '' saberes: - moodleUrl: 'https://saberes.senado.leg.br' - moodleToken: 'altereme' + moodleUrl: '' + moodleToken: '' ingress: enabled: true diff --git a/charts/sigi/v0.2.4/Chart.yaml b/charts/sigi/v0.2.4/Chart.yaml index 0c870fe..e1d0aef 100755 --- a/charts/sigi/v0.2.4/Chart.yaml +++ b/charts/sigi/v0.2.4/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.4 +version: 0.2.4-r1 # 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.2.4/questions.yaml b/charts/sigi/v0.2.4/questions.yaml index ae15bd9..3ed4642 100755 --- a/charts/sigi/v0.2.4/questions.yaml +++ b/charts/sigi/v0.2.4/questions.yaml @@ -14,6 +14,119 @@ questions: group: Básico required: true +# Correio +- variable: sigi.emailAdmins + default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" + description: "Administrador email SIGI" + label: "ADMINS" + type: string + group: Correio + required: false +- variable: sigi.defaultFromEmail + default: "sigi@interlegis.leg.br" + description: "Remetente padrão do email" + label: "DEFAULT_FROM_EMAIL" + type: string + group: Correio + required: false +# - variable: sigi.useTls +# default: "False" +# description: "Usar TLS ao conectar no servidor SMTP?" +# label: "Usar TLS" +# type: enum +# group: Correio +# options: +# - "True" +# - "False" +# required: false +- variable: sigi.emailPort + default: 25 + description: "Porta de envio de E-mail (SMTP)" + type: int + label: "EMAIL_PORT" + required: false + group: Correio +- variable: sigi.emailHost + default: "smtp.interlegis.leg.br" + description: "Servidor de envio de e-mail (SMTP)" + label: "EMAIL_HOST" + type: string + group: Correio + required: false + +# ldap auth +- variable: sigi.auth.ldap.serverURI + default: '' + description: "Servidor autenticação ldap" + label: "AUTH_LDAP_SERVER_URI" + type: string + group: LDAP + required: true +- variable: sigi.auth.ldap.bindDN + default: '' + description: "Bind de autenticação ldap" + label: "AUTH_LDAP_BIND_DN" + type: string + group: LDAP + required: true +- variable: sigi.auth.ldap.bindPwd + default: '' + description: "Autenticação do Bind no ldap" + label: "AUTH_LDAP_BIND_PASSWORD" + type: string + group: LDAP + required: true +- variable: sigi.auth.ldap.user + default: '' + description: "OU de Usuário no ldap" + label: "AUTH_LDAP_USER" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userSearchString + default: '' + description: "Query de pesquisa de Usuários no ldap" + label: "AUTH_LDAP_USER_SEARCH_STRING" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userAttrMap + default: '' + description: "Atributos do Usuário no ldap" + label: "AUTH_LDAP_USER_ATTR_MAP" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.profileAttrMap + default: '' + description: "Atributos do perfil do Usuário no ldap" + label: "AUTH_LDAP_PROFILE_ATTR_MAP" + type: string + group: LDAP + required: false +- variable: sigi.auth.profileModule + default: '' + description: "Módulo do perfil do Usuário no ldap" + label: "AUTH_PROFILE_MODULE" + type: string + group: LDAP + required: false + +# Saberes +- variable: sigi.saberes.moodleUrl + default: '' + description: "Servidor moodle saberes" + label: "MOODLE_BASE_URL" + type: string + group: Saberes + required: false +- variable: sigi.saberes.moodleToken + default: '' + description: "Token conexão Saberes" + label: "MOODLE_API_TOKEN" + type: string + group: Saberes + required: false # Ingress - variable: ingress.tls.enabled @@ -36,7 +149,6 @@ questions: - letsencrypt - letsencrypt-hml - aws - - variable: ingress.class default: nginx type: enum @@ -48,39 +160,6 @@ questions: - nginx - alb -## Correio -#- variable: sigi.emailSendUser -# default: "sigi@interlegis.leg.br" -# description: "Remetente dos e-mails enviados pelo SIGI" -# label: "Remetente" -# type: string -# group: Correio -# required: false -#- variable: sigi.useTls -# default: "False" -# description: "Usar TLS ao conectar no servidor SMTP?" -# label: "Usar TLS" -# type: enum -# group: Correio -# options: -# - "True" -# - "False" -# required: false -#- variable: sigi.emailPort -# default: 25 -# description: "Porta de envio de E-mail (SMTP)" -# type: int -# label: "Porta SMTP" -# required: false -# group: Correio -#- variable: sigi.emailHost -# default: "smtp.interlegis.leg.br" -# description: "Servidor de envio de e-mail (SMTP)" -# label: "Servidor SMTP" -# type: string -# group: Correio -# required: false - ## PostgreSQL #- variable: postgresql.internal # default: true diff --git a/charts/sigi/v0.2.4/templates/deployment.yaml b/charts/sigi/v0.2.4/templates/deployment.yaml index cedb5a5..b6f8321 100755 --- a/charts/sigi/v0.2.4/templates/deployment.yaml +++ b/charts/sigi/v0.2.4/templates/deployment.yaml @@ -60,11 +60,12 @@ spec: - name: AUTH_LDAP_USER value: "{{ .Values.sigi.auth.ldap.user }}" - name: AUTH_LDAP_BIND_PASSWORD - valueFrom: - # Secret Key - secretKeyRef: - name: {{ include "sigi.fullname" . }}-auth-ldap-key - key: AUTH_LDAP_BIND_PASSWORD + value: "{{ .Values.sigi.auth.ldap.bindPwd }}" + # valueFrom: + # # Secret Key + # secretKeyRef: + # name: {{ include "sigi.fullname" . }}-auth-ldap-key + # key: AUTH_LDAP_BIND_PASSWORD - name: AUTH_LDAP_USER_SEARCH_STRING value: "{{ .Values.sigi.auth.ldap.userSearchString }}" - name: AUTH_LDAP_USER_ATTR_MAP @@ -90,11 +91,12 @@ spec: - name: MOODLE_BASE_URL value: "{{ .Values.sigi.saberes.moodleUrl }}" - name: MOODLE_API_TOKEN - valueFrom: - # Secret Key - secretKeyRef: - name: {{ include "sigi.fullname" . }}-saberes-tkn - key: MOODLE_API_TOKEN + value: "{{ .Values.sigi.saberes.moodleToken }}" + # valueFrom: + # # Secret Key + # secretKeyRef: + # name: {{ include "sigi.fullname" . }}-saberes-tkn + # key: MOODLE_API_TOKEN volumeMounts: # - mountPath: /var/interlegis/sigi/data # name: data diff --git a/charts/sigi/v0.2.4/templates/sigi-ldap-secret.yaml b/charts/sigi/v0.2.4/templates/sigi-ldap-secret.yaml deleted file mode 100644 index a8881a8..0000000 --- a/charts/sigi/v0.2.4/templates/sigi-ldap-secret.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "sigi.fullname" . }}-auth-ldap-key - labels: - {{- include "sigi.labels" . | nindent 4 }} -type: Opaque -data: -{{- if .Release.IsUpgrade }} - AUTH_LDAP_BIND_PASSWORD: {{ index (lookup "v1" "Secret" .Release.Namespace (printf "%s-auth-ldap-key" (include "sigi.fullname" .))).data "AUTH_LDAP_BIND_PASSWORD" }} -{{ else }} # install operation - AUTH_LDAP_BIND_PASSWORD: {{ .Values.sigi.auth.ldap.bindPwd | b64enc }} -{{ end }} diff --git a/charts/sigi/v0.2.4/templates/sigi-saberes-token.yaml b/charts/sigi/v0.2.4/templates/sigi-saberes-token.yaml deleted file mode 100644 index 39c4ba7..0000000 --- a/charts/sigi/v0.2.4/templates/sigi-saberes-token.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "sigi.fullname" . }}-saberes-tkn - labels: - {{- include "sigi.labels" . | nindent 4 }} -type: Opaque -data: -{{- if .Release.IsUpgrade }} - MOODLE_API_TOKEN: {{ index (lookup "v1" "Secret" .Release.Namespace (printf "%s-saberes-tkn" (include "sigi.fullname" .))).data "MOODLE_API_TOKEN" }} -{{ else }} # install operation - MOODLE_API_TOKEN: {{ .Values.sigi.saberes.moodleToken | b64enc }} -{{ end }} diff --git a/charts/sigi/v0.2.4/values.yaml b/charts/sigi/v0.2.4/values.yaml index a8f4e81..28438b3 100755 --- a/charts/sigi/v0.2.4/values.yaml +++ b/charts/sigi/v0.2.4/values.yaml @@ -58,12 +58,12 @@ sigi: defaultFromEmail: 'sigi@interlegis.leg.br' auth: ldap: - serverURI: 'ldap://ad.senado.gov.br' - bindDN: 'CN=Sistema de Informações Gerenciais do Interlegis Service Account,OU=_UsuariosServicos,OU=2-AdministracaoSistemas,DC=senado,DC=gov,DC=br' - bindPwd: 'RgtJdtvas7s4BSpjnVnR' - user: 'U=UsuariosPessoas,DC=senado,DC=gov,DC=br' - userSearchString: '(&(sAMAccountName=%(user)s)(department=*ILB*)(!(title=*Desligad*))(!(title=*inativ*)))' - userAttrMap: '{"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", }' + serverURI: '' + bindDN: '' + bindPwd: '' + user: '' + userSearchString: '' + userAttrMap: '' group: '' groupSearchString: '' groupTypeString: '' @@ -71,11 +71,11 @@ sigi: mirrorGroups: False cacheGroups: False groupCacheTimeout: 0 - profileAttrMap: '{"nome_completo": "cn"}' - profileModule: 'servidores.Servidor' + profileAttrMap: '' + profileModule: '' saberes: - moodleUrl: 'https://saberes.senado.leg.br' - moodleToken: 'altereme' + moodleUrl: '' + moodleToken: '' ingress: enabled: true diff --git a/charts/sigi/v0.2.x/templates/ingress.yaml b/charts/sigi/v0.2.x/templates/ingress.yaml index b33156a..fa56bfd 100755 --- a/charts/sigi/v0.2.x/templates/ingress.yaml +++ b/charts/sigi/v0.2.x/templates/ingress.yaml @@ -4,7 +4,7 @@ {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 +apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} diff --git a/charts/sigi/v0.2.x/values.yaml b/charts/sigi/v0.2.x/values.yaml index a8f4e81..7096fa9 100755 --- a/charts/sigi/v0.2.x/values.yaml +++ b/charts/sigi/v0.2.x/values.yaml @@ -61,7 +61,7 @@ sigi: serverURI: 'ldap://ad.senado.gov.br' bindDN: 'CN=Sistema de Informações Gerenciais do Interlegis Service Account,OU=_UsuariosServicos,OU=2-AdministracaoSistemas,DC=senado,DC=gov,DC=br' bindPwd: 'RgtJdtvas7s4BSpjnVnR' - user: 'U=UsuariosPessoas,DC=senado,DC=gov,DC=br' + user: 'OU=UsuariosPessoas,DC=senado,DC=gov,DC=br' userSearchString: '(&(sAMAccountName=%(user)s)(department=*ILB*)(!(title=*Desligad*))(!(title=*inativ*)))' userAttrMap: '{"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", }' group: ''