From 68617a274d80d83339fbc2bf81cceb4397a5f8d7 Mon Sep 17 00:00:00 2001
From: Keny Villela <keny@interlegis.leg.br>
Date: Tue, 12 Jul 2022 17:22:13 -0300
Subject: [PATCH] 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