From 506e39d313377154656734ef8e508d5fa811c830 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Tue, 2 May 2023 15:51:15 -0300 Subject: [PATCH 01/16] return v1beta1 apiversion helm 0.2.2 -- --- charts/sigi/v0.2.2/templates/ingress.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/charts/sigi/v0.2.2/templates/ingress.yaml b/charts/sigi/v0.2.2/templates/ingress.yaml index fa56bfd..46039e2 100644 --- a/charts/sigi/v0.2.2/templates/ingress.yaml +++ b/charts/sigi/v0.2.2/templates/ingress.yaml @@ -1,9 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "sigi.fullname" . -}} {{- $hostName := .Values.sigi.hostname -}} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -60,13 +58,6 @@ spec: pathType: ImplementationSpecific {{- end }} backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: 80 - {{- else }} serviceName: {{ $fullName }} servicePort: http - {{- end }} {{- end }} From 7a21fd2c669a51e6b09f1f75123b700b81cb4e54 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Tue, 2 May 2023 16:04:27 -0300 Subject: [PATCH 02/16] return helm 0.2.2 with v1 --- charts/sigi/v0.2.2/templates/ingress.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/sigi/v0.2.2/templates/ingress.yaml b/charts/sigi/v0.2.2/templates/ingress.yaml index 46039e2..fa56bfd 100644 --- a/charts/sigi/v0.2.2/templates/ingress.yaml +++ b/charts/sigi/v0.2.2/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "sigi.fullname" . -}} {{- $hostName := .Values.sigi.hostname -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- 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/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -58,6 +60,13 @@ spec: pathType: ImplementationSpecific {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: 80 + {{- else }} serviceName: {{ $fullName }} servicePort: http + {{- end }} {{- end }} From 60829b1388fc28d4d27f8ba1c8f0453ad1e4af50 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 13:57:42 -0300 Subject: [PATCH 03/16] test helm 0.2.2 --- charts/sigi/v0.2.3/questions.yaml | 147 +++++++++++++++++++++++------- charts/sigi/v0.2.3/values.yaml | 20 ++-- 2 files changed, 123 insertions(+), 44 deletions(-) diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index ae15bd9..471ebe5 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 do e-mail do SIGI" + label: "Administrador" + type: string + group: Correio + required: false +- variable: sigi.defaultFromEmail + 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 + +# ldap auth +- variable: sigi.auth.ldap.serverURI + default: '' + description: "Servidor autenticação ldap" + label: "Servidor ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.bindDN + default: '' + description: "Bind de autenticação ldap" + label: "Bind de autenticação ldap" + type: string + group: LDAP + required: false +# - variable: sigi.auth.ldap.bindPwd +# default: 'altereme' +# description: "Autenticação do Bind no ldap" +# label: "Senha Bind" +# type: string +# group: LDAP +# required: false +- variable: sigi.auth.ldap.user + default: '' + description: "OU de Usuário no ldap" + label: "OU a ser utilizada na autenticação de Usuário no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userSearchString + default: '' + description: "Query de pesquisa de Usuários no ldap" + label: "Pesquisa no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userAttrMap + default: '' + description: "Atributos do Usuário buscados no ldap" + label: "Atributos do usuário no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.profileAttrMap + default: '' + description: "Atributos do perfil do Usuário no ldap" + label: "Atributos do perfil do usuário" + type: string + group: LDAP + required: false +- variable: sigi.auth.profileModule + default: '' + description: "Módulo do perfil do Usuário no ldap" + label: "Módulo do perfil do usuário" + type: string + group: LDAP + required: false + +# Saberes +- variable: sigi.saberes.moodleUrl + default: '' + description: "Servidor moodle saberes" + label: "Servidor Saberes" + type: string + group: Saberes + required: false +- variable: sigi.saberes.moodleToken + default: 'altereme' + description: "Token conexão Saberes" + label: "Token Saberes" + 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/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 From e982a4bac298425d187f78e380879b17a0291bcc Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 13:59:31 -0300 Subject: [PATCH 04/16] test helm 0.2.3 --- charts/sigi/v0.2.2/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 11a7479dfe9f4874f74836767a7b0a65b06af1a1 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 14:13:12 -0300 Subject: [PATCH 05/16] test helm 0.2.3 - correction --- charts/sigi/v0.2.3/questions.yaml | 168 +++++++++++++++--------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index 471ebe5..70aa25a 100644 --- a/charts/sigi/v0.2.3/questions.yaml +++ b/charts/sigi/v0.2.3/questions.yaml @@ -16,19 +16,19 @@ questions: # Correio - variable: sigi.emailAdmins - default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" - description: "Administrador do e-mail do SIGI" - label: "Administrador" - type: string - group: Correio - required: false + default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" + description: "Administrador do e-mail do SIGI" + label: "Administrador" + type: string + group: Correio + required: false - variable: sigi.defaultFromEmail - default: "sigi@interlegis.leg.br" - description: "Remetente dos e-mails enviados pelo SIGI" - label: "Remetente" - type: string - group: Correio - required: false + 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?" @@ -40,93 +40,93 @@ questions: # - "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 + 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 + default: "smtp.interlegis.leg.br" + description: "Servidor de envio de e-mail (SMTP)" + label: "Servidor SMTP" + type: string + group: Correio + required: false # ldap auth - variable: sigi.auth.ldap.serverURI - default: '' - description: "Servidor autenticação ldap" - label: "Servidor ldap" - type: string - group: LDAP - required: false + default: '' + description: "Servidor autenticação ldap" + label: "Servidor ldap" + type: string + group: LDAP + required: false - variable: sigi.auth.ldap.bindDN - default: '' - description: "Bind de autenticação ldap" - label: "Bind de autenticação ldap" - type: string - group: LDAP - required: false + default: '' + description: "Bind de autenticação ldap" + label: "Bind de autenticação ldap" + type: string + group: LDAP + required: false # - variable: sigi.auth.ldap.bindPwd -# default: 'altereme' -# description: "Autenticação do Bind no ldap" -# label: "Senha Bind" -# type: string -# group: LDAP -# required: false +# default: 'altereme' +# description: "Autenticação do Bind no ldap" +# label: "Senha Bind" +# type: string +# group: LDAP +# required: false - variable: sigi.auth.ldap.user - default: '' - description: "OU de Usuário no ldap" - label: "OU a ser utilizada na autenticação de Usuário no ldap" - type: string - group: LDAP - required: false + default: '' + description: "OU de Usuário no ldap" + label: "OU a ser utilizada na autenticação de Usuário no ldap" + type: string + group: LDAP + required: false - variable: sigi.auth.ldap.userSearchString - default: '' - description: "Query de pesquisa de Usuários no ldap" - label: "Pesquisa no ldap" - type: string - group: LDAP - required: false + default: '' + description: "Query de pesquisa de Usuários no ldap" + label: "Pesquisa no ldap" + type: string + group: LDAP + required: false - variable: sigi.auth.ldap.userAttrMap - default: '' - description: "Atributos do Usuário buscados no ldap" - label: "Atributos do usuário no ldap" - type: string - group: LDAP - required: false + default: '' + description: "Atributos do Usuário buscados no ldap" + label: "Atributos do usuário no ldap" + type: string + group: LDAP + required: false - variable: sigi.auth.ldap.profileAttrMap - default: '' - description: "Atributos do perfil do Usuário no ldap" - label: "Atributos do perfil do usuário" - type: string - group: LDAP - required: false + default: '' + description: "Atributos do perfil do Usuário no ldap" + label: "Atributos do perfil do usuário" + type: string + group: LDAP + required: false - variable: sigi.auth.profileModule - default: '' - description: "Módulo do perfil do Usuário no ldap" - label: "Módulo do perfil do usuário" - type: string - group: LDAP - required: false + default: '' + description: "Módulo do perfil do Usuário no ldap" + label: "Módulo do perfil do usuário" + type: string + group: LDAP + required: false # Saberes - variable: sigi.saberes.moodleUrl - default: '' - description: "Servidor moodle saberes" - label: "Servidor Saberes" - type: string - group: Saberes - required: false + default: '' + description: "Servidor moodle saberes" + label: "Servidor Saberes" + type: string + group: Saberes + required: false - variable: sigi.saberes.moodleToken - default: 'altereme' - description: "Token conexão Saberes" - label: "Token Saberes" - type: string - group: Saberes - required: false + default: 'altereme' + description: "Token conexão Saberes" + label: "Token Saberes" + type: string + group: Saberes + required: false # Ingress - variable: ingress.tls.enabled From 0c2b97ed7f15d8be6647333d25180f0858d89e78 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 14:23:12 -0300 Subject: [PATCH 06/16] test helm 0.2.4 --- charts/sigi/v0.2.4/questions.yaml | 147 +++++++++++++++++++++++------- charts/sigi/v0.2.4/values.yaml | 20 ++-- charts/sigi/v0.2.x/values.yaml | 2 +- 3 files changed, 124 insertions(+), 45 deletions(-) diff --git a/charts/sigi/v0.2.4/questions.yaml b/charts/sigi/v0.2.4/questions.yaml index ae15bd9..70aa25a 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 do e-mail do SIGI" + label: "Administrador" + type: string + group: Correio + required: false +- variable: sigi.defaultFromEmail + 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 + +# ldap auth +- variable: sigi.auth.ldap.serverURI + default: '' + description: "Servidor autenticação ldap" + label: "Servidor ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.bindDN + default: '' + description: "Bind de autenticação ldap" + label: "Bind de autenticação ldap" + type: string + group: LDAP + required: false +# - variable: sigi.auth.ldap.bindPwd +# default: 'altereme' +# description: "Autenticação do Bind no ldap" +# label: "Senha Bind" +# type: string +# group: LDAP +# required: false +- variable: sigi.auth.ldap.user + default: '' + description: "OU de Usuário no ldap" + label: "OU a ser utilizada na autenticação de Usuário no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userSearchString + default: '' + description: "Query de pesquisa de Usuários no ldap" + label: "Pesquisa no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userAttrMap + default: '' + description: "Atributos do Usuário buscados no ldap" + label: "Atributos do usuário no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.profileAttrMap + default: '' + description: "Atributos do perfil do Usuário no ldap" + label: "Atributos do perfil do usuário" + type: string + group: LDAP + required: false +- variable: sigi.auth.profileModule + default: '' + description: "Módulo do perfil do Usuário no ldap" + label: "Módulo do perfil do usuário" + type: string + group: LDAP + required: false + +# Saberes +- variable: sigi.saberes.moodleUrl + default: '' + description: "Servidor moodle saberes" + label: "Servidor Saberes" + type: string + group: Saberes + required: false +- variable: sigi.saberes.moodleToken + default: 'altereme' + description: "Token conexão Saberes" + label: "Token Saberes" + 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/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/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: '' From 55627e6b9223d3abcc8e402398bcabdd74748161 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 14:37:47 -0300 Subject: [PATCH 07/16] return v0.2.3 --- charts/sigi/v0.2.3/questions.yaml | 147 +++++++----------------------- charts/sigi/v0.2.3/values.yaml | 20 ++-- 2 files changed, 44 insertions(+), 123 deletions(-) diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index 70aa25a..ae15bd9 100644 --- a/charts/sigi/v0.2.3/questions.yaml +++ b/charts/sigi/v0.2.3/questions.yaml @@ -14,119 +14,6 @@ questions: group: Básico required: true -# Correio -- variable: sigi.emailAdmins - default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" - description: "Administrador do e-mail do SIGI" - label: "Administrador" - type: string - group: Correio - required: false -- variable: sigi.defaultFromEmail - 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 - -# ldap auth -- variable: sigi.auth.ldap.serverURI - default: '' - description: "Servidor autenticação ldap" - label: "Servidor ldap" - type: string - group: LDAP - required: false -- variable: sigi.auth.ldap.bindDN - default: '' - description: "Bind de autenticação ldap" - label: "Bind de autenticação ldap" - type: string - group: LDAP - required: false -# - variable: sigi.auth.ldap.bindPwd -# default: 'altereme' -# description: "Autenticação do Bind no ldap" -# label: "Senha Bind" -# type: string -# group: LDAP -# required: false -- variable: sigi.auth.ldap.user - default: '' - description: "OU de Usuário no ldap" - label: "OU a ser utilizada na autenticação de Usuário no ldap" - type: string - group: LDAP - required: false -- variable: sigi.auth.ldap.userSearchString - default: '' - description: "Query de pesquisa de Usuários no ldap" - label: "Pesquisa no ldap" - type: string - group: LDAP - required: false -- variable: sigi.auth.ldap.userAttrMap - default: '' - description: "Atributos do Usuário buscados no ldap" - label: "Atributos do usuário no ldap" - type: string - group: LDAP - required: false -- variable: sigi.auth.ldap.profileAttrMap - default: '' - description: "Atributos do perfil do Usuário no ldap" - label: "Atributos do perfil do usuário" - type: string - group: LDAP - required: false -- variable: sigi.auth.profileModule - default: '' - description: "Módulo do perfil do Usuário no ldap" - label: "Módulo do perfil do usuário" - type: string - group: LDAP - required: false - -# Saberes -- variable: sigi.saberes.moodleUrl - default: '' - description: "Servidor moodle saberes" - label: "Servidor Saberes" - type: string - group: Saberes - required: false -- variable: sigi.saberes.moodleToken - default: 'altereme' - description: "Token conexão Saberes" - label: "Token Saberes" - type: string - group: Saberes - required: false # Ingress - variable: ingress.tls.enabled @@ -149,6 +36,7 @@ questions: - letsencrypt - letsencrypt-hml - aws + - variable: ingress.class default: nginx type: enum @@ -160,6 +48,39 @@ 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/values.yaml b/charts/sigi/v0.2.3/values.yaml index 28438b3..7096fa9 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: '' - bindDN: '' - bindPwd: '' - user: '' - userSearchString: '' - userAttrMap: '' + 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: '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: '' groupSearchString: '' groupTypeString: '' @@ -71,11 +71,11 @@ sigi: mirrorGroups: False cacheGroups: False groupCacheTimeout: 0 - profileAttrMap: '' - profileModule: '' + profileAttrMap: '{"nome_completo": "cn"}' + profileModule: 'servidores.Servidor' saberes: - moodleUrl: '' - moodleToken: '' + moodleUrl: 'https://saberes.senado.leg.br' + moodleToken: 'altereme' ingress: enabled: true From 2914b5bbb1e88160b0fdf2ec112105796d7adf78 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 14:44:09 -0300 Subject: [PATCH 08/16] new test v0.2.3 --- charts/sigi/v0.2.3/questions.yaml | 147 +++++++++++++++++++++++------- charts/sigi/v0.2.3/values.yaml | 20 ++-- 2 files changed, 123 insertions(+), 44 deletions(-) diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index ae15bd9..70aa25a 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 do e-mail do SIGI" + label: "Administrador" + type: string + group: Correio + required: false +- variable: sigi.defaultFromEmail + 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 + +# ldap auth +- variable: sigi.auth.ldap.serverURI + default: '' + description: "Servidor autenticação ldap" + label: "Servidor ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.bindDN + default: '' + description: "Bind de autenticação ldap" + label: "Bind de autenticação ldap" + type: string + group: LDAP + required: false +# - variable: sigi.auth.ldap.bindPwd +# default: 'altereme' +# description: "Autenticação do Bind no ldap" +# label: "Senha Bind" +# type: string +# group: LDAP +# required: false +- variable: sigi.auth.ldap.user + default: '' + description: "OU de Usuário no ldap" + label: "OU a ser utilizada na autenticação de Usuário no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userSearchString + default: '' + description: "Query de pesquisa de Usuários no ldap" + label: "Pesquisa no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.userAttrMap + default: '' + description: "Atributos do Usuário buscados no ldap" + label: "Atributos do usuário no ldap" + type: string + group: LDAP + required: false +- variable: sigi.auth.ldap.profileAttrMap + default: '' + description: "Atributos do perfil do Usuário no ldap" + label: "Atributos do perfil do usuário" + type: string + group: LDAP + required: false +- variable: sigi.auth.profileModule + default: '' + description: "Módulo do perfil do Usuário no ldap" + label: "Módulo do perfil do usuário" + type: string + group: LDAP + required: false + +# Saberes +- variable: sigi.saberes.moodleUrl + default: '' + description: "Servidor moodle saberes" + label: "Servidor Saberes" + type: string + group: Saberes + required: false +- variable: sigi.saberes.moodleToken + default: 'altereme' + description: "Token conexão Saberes" + label: "Token Saberes" + 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/values.yaml b/charts/sigi/v0.2.3/values.yaml index 7096fa9..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: '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", }' + 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 From 1decac3c955dd96c8e4b470ef1624bb2be0a4613 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 15:00:24 -0300 Subject: [PATCH 09/16] new test v0.2.3 + --- charts/sigi/v0.2.3/questions.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index 70aa25a..d3fb2da 100644 --- a/charts/sigi/v0.2.3/questions.yaml +++ b/charts/sigi/v0.2.3/questions.yaml @@ -69,13 +69,13 @@ questions: type: string group: LDAP required: false -# - variable: sigi.auth.ldap.bindPwd -# default: 'altereme' -# description: "Autenticação do Bind no ldap" -# label: "Senha Bind" -# type: string -# group: LDAP -# required: false +- variable: sigi.auth.ldap.bindPwd + default: 'altereme' + description: "Autenticação do Bind no ldap" + label: "Senha Bind" + type: string + group: LDAP + required: false - variable: sigi.auth.ldap.user default: '' description: "OU de Usuário no ldap" From 7ecb6711e5513f9df3f5e12d4ca0c55023a02283 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 15:01:32 -0300 Subject: [PATCH 10/16] new test v0.2.3 + --- charts/sigi/v0.2.4/questions.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/sigi/v0.2.4/questions.yaml b/charts/sigi/v0.2.4/questions.yaml index 70aa25a..d3fb2da 100755 --- a/charts/sigi/v0.2.4/questions.yaml +++ b/charts/sigi/v0.2.4/questions.yaml @@ -69,13 +69,13 @@ questions: type: string group: LDAP required: false -# - variable: sigi.auth.ldap.bindPwd -# default: 'altereme' -# description: "Autenticação do Bind no ldap" -# label: "Senha Bind" -# type: string -# group: LDAP -# required: false +- variable: sigi.auth.ldap.bindPwd + default: 'altereme' + description: "Autenticação do Bind no ldap" + label: "Senha Bind" + type: string + group: LDAP + required: false - variable: sigi.auth.ldap.user default: '' description: "OU de Usuário no ldap" From 6c401ffab3b6bf0c234ce80f851984cda5f9d7c2 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 15:35:49 -0300 Subject: [PATCH 11/16] new test v0.2.3 +++ --- charts/sigi/v0.2.3/questions.yaml | 44 +++++++++++++++---------------- charts/sigi/v0.2.4/questions.yaml | 44 +++++++++++++++---------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml index d3fb2da..3ed4642 100644 --- a/charts/sigi/v0.2.3/questions.yaml +++ b/charts/sigi/v0.2.3/questions.yaml @@ -17,15 +17,15 @@ questions: # Correio - variable: sigi.emailAdmins default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" - description: "Administrador do e-mail do SIGI" - label: "Administrador" + description: "Administrador email SIGI" + label: "ADMINS" type: string group: Correio required: false - variable: sigi.defaultFromEmail default: "sigi@interlegis.leg.br" - description: "Remetente dos e-mails enviados pelo SIGI" - label: "Remetente" + description: "Remetente padrão do email" + label: "DEFAULT_FROM_EMAIL" type: string group: Correio required: false @@ -43,13 +43,13 @@ questions: default: 25 description: "Porta de envio de E-mail (SMTP)" type: int - label: "Porta SMTP" + label: "EMAIL_PORT" required: false group: Correio - variable: sigi.emailHost default: "smtp.interlegis.leg.br" description: "Servidor de envio de e-mail (SMTP)" - label: "Servidor SMTP" + label: "EMAIL_HOST" type: string group: Correio required: false @@ -58,56 +58,56 @@ questions: - variable: sigi.auth.ldap.serverURI default: '' description: "Servidor autenticação ldap" - label: "Servidor ldap" + label: "AUTH_LDAP_SERVER_URI" type: string group: LDAP - required: false + required: true - variable: sigi.auth.ldap.bindDN default: '' description: "Bind de autenticação ldap" - label: "Bind de autenticação ldap" + label: "AUTH_LDAP_BIND_DN" type: string group: LDAP - required: false + required: true - variable: sigi.auth.ldap.bindPwd - default: 'altereme' + default: '' description: "Autenticação do Bind no ldap" - label: "Senha Bind" + label: "AUTH_LDAP_BIND_PASSWORD" type: string group: LDAP - required: false + required: true - variable: sigi.auth.ldap.user default: '' description: "OU de Usuário no ldap" - label: "OU a ser utilizada na autenticação 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: "Pesquisa 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 buscados no ldap" - label: "Atributos do usuário no ldap" + 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: "Atributos do perfil do usuário" + 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: "Módulo do perfil do usuário" + label: "AUTH_PROFILE_MODULE" type: string group: LDAP required: false @@ -116,14 +116,14 @@ questions: - variable: sigi.saberes.moodleUrl default: '' description: "Servidor moodle saberes" - label: "Servidor Saberes" + label: "MOODLE_BASE_URL" type: string group: Saberes required: false - variable: sigi.saberes.moodleToken - default: 'altereme' + default: '' description: "Token conexão Saberes" - label: "Token Saberes" + label: "MOODLE_API_TOKEN" type: string group: Saberes required: false diff --git a/charts/sigi/v0.2.4/questions.yaml b/charts/sigi/v0.2.4/questions.yaml index d3fb2da..3ed4642 100755 --- a/charts/sigi/v0.2.4/questions.yaml +++ b/charts/sigi/v0.2.4/questions.yaml @@ -17,15 +17,15 @@ questions: # Correio - variable: sigi.emailAdmins default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)" - description: "Administrador do e-mail do SIGI" - label: "Administrador" + description: "Administrador email SIGI" + label: "ADMINS" type: string group: Correio required: false - variable: sigi.defaultFromEmail default: "sigi@interlegis.leg.br" - description: "Remetente dos e-mails enviados pelo SIGI" - label: "Remetente" + description: "Remetente padrão do email" + label: "DEFAULT_FROM_EMAIL" type: string group: Correio required: false @@ -43,13 +43,13 @@ questions: default: 25 description: "Porta de envio de E-mail (SMTP)" type: int - label: "Porta SMTP" + label: "EMAIL_PORT" required: false group: Correio - variable: sigi.emailHost default: "smtp.interlegis.leg.br" description: "Servidor de envio de e-mail (SMTP)" - label: "Servidor SMTP" + label: "EMAIL_HOST" type: string group: Correio required: false @@ -58,56 +58,56 @@ questions: - variable: sigi.auth.ldap.serverURI default: '' description: "Servidor autenticação ldap" - label: "Servidor ldap" + label: "AUTH_LDAP_SERVER_URI" type: string group: LDAP - required: false + required: true - variable: sigi.auth.ldap.bindDN default: '' description: "Bind de autenticação ldap" - label: "Bind de autenticação ldap" + label: "AUTH_LDAP_BIND_DN" type: string group: LDAP - required: false + required: true - variable: sigi.auth.ldap.bindPwd - default: 'altereme' + default: '' description: "Autenticação do Bind no ldap" - label: "Senha Bind" + label: "AUTH_LDAP_BIND_PASSWORD" type: string group: LDAP - required: false + required: true - variable: sigi.auth.ldap.user default: '' description: "OU de Usuário no ldap" - label: "OU a ser utilizada na autenticação 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: "Pesquisa 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 buscados no ldap" - label: "Atributos do usuário no ldap" + 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: "Atributos do perfil do usuário" + 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: "Módulo do perfil do usuário" + label: "AUTH_PROFILE_MODULE" type: string group: LDAP required: false @@ -116,14 +116,14 @@ questions: - variable: sigi.saberes.moodleUrl default: '' description: "Servidor moodle saberes" - label: "Servidor Saberes" + label: "MOODLE_BASE_URL" type: string group: Saberes required: false - variable: sigi.saberes.moodleToken - default: 'altereme' + default: '' description: "Token conexão Saberes" - label: "Token Saberes" + label: "MOODLE_API_TOKEN" type: string group: Saberes required: false From bb4bae69abd4e9ed6ac21a817f0aa95bfa4b1086 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 16:17:53 -0300 Subject: [PATCH 12/16] final test v0.2.3 --- charts/sigi/v0.2.3/templates/deployment.yaml | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 From 9270e5b832321016b6240b92d4e8f6e36c37605a Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 17:18:47 -0300 Subject: [PATCH 13/16] final v0.2.3 and v0.2.4 --- charts/sigi/v0.2.4/templates/deployment.yaml | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 From 7cbc7c33996408a47a87839632f61e9f652fb055 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 3 May 2023 17:26:11 -0300 Subject: [PATCH 14/16] final v0.2.4 --- charts/sigi/v0.2.4/templates/sigi-ldap-secret.yaml | 13 ------------- .../sigi/v0.2.4/templates/sigi-saberes-token.yaml | 13 ------------- 2 files changed, 26 deletions(-) delete mode 100644 charts/sigi/v0.2.4/templates/sigi-ldap-secret.yaml delete mode 100644 charts/sigi/v0.2.4/templates/sigi-saberes-token.yaml 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 }} From 4f1dd3572bb9dff9603c607cf3732ac3c9774c0e Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Thu, 4 May 2023 11:21:19 -0300 Subject: [PATCH 15/16] rm sigi secrets v0.2.3 --- charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml | 10 ---------- charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml | 10 ---------- charts/sigi/v0.2.x/templates/ingress.yaml | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml delete mode 100644 charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml 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.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 }} From 06f7f8f020a22e311b7839b56cd92e7029808029 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Thu, 4 May 2023 11:22:24 -0300 Subject: [PATCH 16/16] rm sigi secrets v0.2.3 --- charts/sigi/v0.2.3/Chart.yaml | 2 +- charts/sigi/v0.2.4/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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.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