From 68617a274d80d83339fbc2bf81cceb4397a5f8d7 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Tue, 12 Jul 2022 17:22:13 -0300 Subject: [PATCH 1/7] postgresql values corrections --- charts/sigi/v0.1.0/questions.yaml | 2 +- charts/sigi/v0.1.0/templates/deployment.yaml | 6 +++--- charts/sigi/v0.1.0/values.yaml | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/charts/sigi/v0.1.0/questions.yaml b/charts/sigi/v0.1.0/questions.yaml index 8dc59ce..5d79b7b 100644 --- a/charts/sigi/v0.1.0/questions.yaml +++ b/charts/sigi/v0.1.0/questions.yaml @@ -99,7 +99,7 @@ questions: type: boolean group: PostgreSQL required: false -- variable: postgresql.postgresqlPassword +- variable: postgresql.auth.Password default: "sigi" description: "Senha do banco de dados Postgres" label: "Senha do Postgres" diff --git a/charts/sigi/v0.1.0/templates/deployment.yaml b/charts/sigi/v0.1.0/templates/deployment.yaml index 06caedc..cb48a6a 100644 --- a/charts/sigi/v0.1.0/templates/deployment.yaml +++ b/charts/sigi/v0.1.0/templates/deployment.yaml @@ -38,7 +38,7 @@ spec: protocol: TCP env: - name: DATABASE_URL - value: {{ printf "postgresql://%s:%s@%s:5432/%s" .Values.postgresql.postgresqlUsername .Values.postgresql.postgresqlPassword (include "postgresql.fullname" .) .Values.postgresql.postgresqlDatabase| quote }} + 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: ADMIN_PASSWORD value: "{{ .Values.sigi.adminPassword }}" - name: ADMIN_EMAIL @@ -59,7 +59,7 @@ spec: # - mountPath: /var/interlegis/sigi/data # name: data - mountPath: /srv/interlegis/sigi/media - name: media + name: {{ include "sigi.fullname" . }}-media livenessProbe: httpGet: path: / @@ -85,7 +85,7 @@ spec: # secret: # defaultMode: 440 # secretName: {{ include "sigi.fullname" . }}-secretkey - - name: media + - name: {{ include "sigi.fullname" . }}-media {{- if .Values.persistence.enabled }} persistentVolumeClaim: claimName: {{ include "sigi.fullname" . }}-media diff --git a/charts/sigi/v0.1.0/values.yaml b/charts/sigi/v0.1.0/values.yaml index 023bd3d..99fea45 100644 --- a/charts/sigi/v0.1.0/values.yaml +++ b/charts/sigi/v0.1.0/values.yaml @@ -85,8 +85,8 @@ velero: postgresql: internal: true image: -# repository: porto.interlegis.leg.br/bitnami/postgresql -# registry: porto.interlegis.leg.br + # repository: porto.interlegis.leg.br/bitnami/postgresql + # registry: porto.interlegis.leg.br registry: docker.io repository: bitnami/postgresql tag: 14.4.0-debian-11-r0 @@ -97,9 +97,10 @@ postgresql: persistence: enabled: true size: 1Gi - postgresqlPassword: sigi - postgresqlUsername: sigi - postgresqlDatabase: sigi + auth: + Password: sigi + Username: sigi + Database: sigi resources: requests: cpu: 50m From 1f167ecc6b24f0a97349bd2660b07e985837b9ef Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 13 Jul 2022 10:24:29 -0300 Subject: [PATCH 2/7] postgresql values test --- charts/sigi/v0.1.0/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/sigi/v0.1.0/values.yaml b/charts/sigi/v0.1.0/values.yaml index 99fea45..186a674 100644 --- a/charts/sigi/v0.1.0/values.yaml +++ b/charts/sigi/v0.1.0/values.yaml @@ -98,6 +98,7 @@ postgresql: enabled: true size: 1Gi auth: + postgresPassword: sigi Password: sigi Username: sigi Database: sigi From 34e3cb0c3a55199d05996bc22d76656bdd1e1bc8 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 13 Jul 2022 10:24:29 -0300 Subject: [PATCH 3/7] postgresql values test --- charts/sigi/v0.1.0/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/sigi/v0.1.0/values.yaml b/charts/sigi/v0.1.0/values.yaml index 99fea45..186a674 100644 --- a/charts/sigi/v0.1.0/values.yaml +++ b/charts/sigi/v0.1.0/values.yaml @@ -98,6 +98,7 @@ postgresql: enabled: true size: 1Gi auth: + postgresPassword: sigi Password: sigi Username: sigi Database: sigi From 91037ad1842fe01a9939e0d52cea208e661afdca Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 13 Jul 2022 13:46:17 +0000 Subject: [PATCH 4/7] Update 'charts/sigi/v0.1.0/values.yaml' --- charts/sigi/v0.1.0/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sigi/v0.1.0/values.yaml b/charts/sigi/v0.1.0/values.yaml index 186a674..ee4c5fd 100644 --- a/charts/sigi/v0.1.0/values.yaml +++ b/charts/sigi/v0.1.0/values.yaml @@ -99,7 +99,7 @@ postgresql: size: 1Gi auth: postgresPassword: sigi - Password: sigi + password: sigi Username: sigi Database: sigi resources: From 4f7b85e70aca348517a3bdd5b158675baae14f81 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 13 Jul 2022 12:15:17 -0300 Subject: [PATCH 5/7] postgresql values test 2 --- charts/sigi/v0.1.0/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sigi/v0.1.0/values.yaml b/charts/sigi/v0.1.0/values.yaml index ee4c5fd..9b5cd7a 100644 --- a/charts/sigi/v0.1.0/values.yaml +++ b/charts/sigi/v0.1.0/values.yaml @@ -39,7 +39,7 @@ securityContext: {} service: type: ClusterIP - port: 80 + port: 8000 persistence: enabled: true From 5e9280221cb369c8a8661f4f03c4fdaa269ca60b Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 13 Jul 2022 13:43:19 -0300 Subject: [PATCH 6/7] postgresql values test 3 --- charts/sigi/v0.1.0/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/sigi/v0.1.0/values.yaml b/charts/sigi/v0.1.0/values.yaml index 9b5cd7a..ee92705 100644 --- a/charts/sigi/v0.1.0/values.yaml +++ b/charts/sigi/v0.1.0/values.yaml @@ -39,7 +39,7 @@ securityContext: {} service: type: ClusterIP - port: 8000 + port: 80 persistence: enabled: true @@ -100,8 +100,8 @@ postgresql: auth: postgresPassword: sigi password: sigi - Username: sigi - Database: sigi + username: sigi + database: sigi resources: requests: cpu: 50m From e126fb54bc05074ac78dbdb26526449326a5ca1f Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Wed, 13 Jul 2022 13:54:17 -0300 Subject: [PATCH 7/7] minor correction --- charts/sigi/v0.1.0/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sigi/v0.1.0/templates/deployment.yaml b/charts/sigi/v0.1.0/templates/deployment.yaml index cb48a6a..42c6b46 100644 --- a/charts/sigi/v0.1.0/templates/deployment.yaml +++ b/charts/sigi/v0.1.0/templates/deployment.yaml @@ -38,7 +38,7 @@ spec: protocol: TCP env: - 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 }} + 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: ADMIN_PASSWORD value: "{{ .Values.sigi.adminPassword }}" - name: ADMIN_EMAIL