Merge branch 'master' of https://gitlab.com/burke-software/django-helm-chart

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 image:
-  name: alpine/helm:3.5.4
+  name: alpine/helm:3.6.3
   entrypoint: ["/bin/sh", "-c"]
 
 lint:

templates/_helpers.tpl

@@ -74,7 +74,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" .Release.Name "django-postgresql" | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -93,11 +93,38 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{/*
-Set postgresql url
+Set postgresql host
 */}}
-{{- define "django.postgresql.url" -}}
+{{- define "django.postgresql.host" -}}
 {{- if .Values.postgresql.enabled -}}
-postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{- template "django.postgresql.fullname" . -}}
+{{- template "django.postgresql.fullname" . -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set postgresql username
+*/}}
+{{- define "django.postgresql.username" -}}
+{{- if .Values.postgresql.enabled -}}
+{{ .Values.postgresql.auth.username | default "postgres" }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set postgresql name
+*/}}
+{{- define "django.postgresql.name" -}}
+{{- if .Values.postgresql.enabled -}}
+{{ .Values.postgresql.auth.database | default "postgres" }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set postgresql port
+*/}}
+{{- define "django.postgresql.port" -}}
+{{- if .Values.postgresql.enabled -}}
+{{ .Values.postgresql.global.postgresql.service.ports.postgresql | default 5432 }}
 {{- end -}}
 {{- end -}}
 

templates/beat/deployment.yaml

@@ -48,10 +48,14 @@ spec:
           env:
             - name: SERVER_ROLE
               value: "beat"
+{{- if .Values.env.secret.DATABASE_URL }}
+            - name: DATABASE_URL
+              value: {{ .Values.env.secret.DATABASE_URL }}
+{{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "django.fullname" . }}
             - configMapRef:
                 name: {{ include "django.fullname" . }}
 {{- end }}
-{{- end }}
+{{- end }}

templates/configmap.yaml

@@ -9,4 +9,10 @@ metadata:
 data:
 {{- range $k, $v := .Values.env.normal }}
   {{ $k }}: {{ $v | quote }}
-{{- end }}
+{{- end }}
+{{- if .Values.postgresql.enabled }}
+  DATABASE_HOST: {{ include "django.postgresql.host" . | quote }}
+  DATABASE_USER: {{ include "django.postgresql.username" . | quote }}
+  DATABASE_NAME: {{ include "django.postgresql.name" . | quote }}
+  DATABASE_PORT: {{ include "django.postgresql.port" . | quote }}
+{{- end }}

templates/pre-install-job.yaml

@@ -31,9 +31,13 @@ spec:
 {{- if .Values.env.secret.DATABASE_URL }}
           - name: DATABASE_URL
             value: {{ .Values.env.secret.DATABASE_URL }}
-{{- else if .Values.postgresql.enabled }}
+{{- end }}
-          - name: DATABASE_URL
+{{- if .Values.postgresql.enabled }}
-            value: {{ include "django.postgresql.url" . | b64enc | quote }}
+          - name: DATABASE_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "django.postgresql.fullname" . }}
+                key: postgres-password
 {{- end }}
           - name: SECRET_KEY
             value: {{ required "env.secret.SECRET_KEY is a required value." .Values.env.secret.SECRET_KEY }}
@@ -41,3 +45,6 @@ spec:
           - name: {{ $k }}
             value: {{ $v | quote }}
         {{- end }}
+        envFrom:
+          - configMapRef:
+              name: {{ include "django.fullname" . }}

templates/secrets.yaml

@@ -12,6 +12,3 @@ data:
 {{- if .Values.redis.enabled }}
   REDIS_URL: {{ include "django.redis.url" . | b64enc | quote }}
 {{- end }}
-{{- if .Values.postgresql.enabled }}
-  DATABASE_URL: {{ include "django.postgresql.url" . | b64enc | quote }}
-{{- end }}

templates/web/deployment.yaml

@@ -64,6 +64,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+{{- if .Values.env.secret.DATABASE_URL }}
+            - name: DATABASE_URL
+              value: {{ .Values.env.secret.DATABASE_URL }}
+{{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "django.fullname" . }}

templates/worker/deployment.yaml

@@ -42,6 +42,10 @@ spec:
           env:
             - name: SERVER_ROLE
               value: "worker"
+{{- if .Values.env.secret.DATABASE_URL }}
+            - name: DATABASE_URL
+              value: {{ .Values.env.secret.DATABASE_URL }}
+{{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "django.fullname" . }}
@@ -59,4 +63,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-{{- end }}
+{{- end }}