.

templates/_helpers.tpl

@@ -96,7 +96,7 @@ Set postgresql url
 */}}
 {{- define "django.postgresql.url" -}}
 {{- if .Values.postgresql.enabled -}}
-postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{- template "django.postgresql.fullname" . -}}:{{- template "django.postgresql.port" . -}}/{{ .Values.postgresql.postgresqlDatabase }}
+postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{- template "django.postgresql.fullname" . -}}
 {{- end -}}
 {{- end -}}
 

templates/configmap.yaml

@@ -10,3 +10,4 @@ data:
 {{- range $k, $v := .Values.env.normal }}
   {{ $k }}: {{ $v | quote }}
 {{- end }}
+  DATABASE_URL: {{ include "django.postgresql.url" . | quote }}

templates/pre-install-job.yaml

@@ -24,7 +24,12 @@ spec:
         env:
           - name: DEBUG
             value: "False"
+{{- if .Values.env.secret.DATABASE_URL }}
           - name: DATABASE_URL
             value: {{ required "env.secret.DATABASE_URL is a required value." .Values.env.secret.DATABASE_URL }}
+{{- else if .Values.postgresql.enabled }}
+          - name: DATABASE_URL
+            value: {{ include "django.postgresql.url" . | b64enc | quote }}
+{{- end }}
           - name: SECRET_KEY
             value: {{ required "secretKey is a required value." .Values.secretKey }}

values.yaml

@@ -117,3 +117,4 @@ redis:
 # Default to disabled, use a managed database service. But can be enabled here.
 postgresql:
   enabled: false
+  postgresqlPassword: # Must be set