Merge branch 'master' of https://git.interlegis.leg.br/SEIT/rancher-charts

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"

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

charts/sigi/v0.1.0/values.yaml

@@ -97,9 +97,11 @@ postgresql:
   persistence:
     enabled: true
     size: 1Gi
-  postgresqlPassword: sigi
+  auth:
-  postgresqlUsername: sigi
+    postgresPassword: sigi
-  postgresqlDatabase: sigi
+    password: sigi
+    username: sigi
+    database: sigi
   resources:
     requests:
       cpu: 50m