Merge pull request #53 from CodeForPhilly/develop

Release: v0.1.6

Author: themightychris

helm-chart/templates/database/statefulset.yaml

@@ -29,17 +29,11 @@ spec:
       containers:
       - name: postgresql
         image: {{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}
-        {{- if or .Values.postgresql.config .Values.postgresql.existingSecret }}
-        envFrom:
-        {{- if .Values.postgresql.config }}
-        - configMapRef:
-            name: {{ include "third-places.fullname" . }}-postgresql
-        {{- end }}
         {{- if .Values.postgresql.existingSecret }}
+        envFrom:
         - secretRef:
             name: {{ .Values.postgresql.existingSecret }}
         {{- end }}
-        {{- end }}
         ports:
         - containerPort: 5432
           name: postgresql

helm-chart/templates/deployment.yaml

@@ -35,7 +35,10 @@ spec:
             - name: PGPORT
               value: "5432"
             - name: PGDATABASE
-              value: thirdplaces
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.postgresql.existingSecret }}
+                  key: POSTGRES_DB
             - name: PGUSER
               valueFrom:
                 secretKeyRef:

helm-chart/values.yaml

@@ -56,15 +56,14 @@ affinity: {}
 
 postgresql:
   image:
-    repository: postgres
-    tag: 13
+    repository: postgis/postgis
+    tag: 13-3.1
   imagePullSecrets: {}
   replicas: 1
   volumes:
     data:
       size: 5Gi
   existingSecret: postgresql
-  config: {}
   podAnnotations: {}
   nodeSelector: {}
   affinity: {}