work check in

This commit is contained in:
David Burke 2021-05-26 19:43:23 -04:00
parent fb8bd654f3
commit 6a9b266751
7 changed files with 25 additions and 41 deletions

View file

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

View file

@ -15,6 +15,10 @@ spec:
activeDeadlineSeconds: 600
template:
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
restartPolicy: Never
containers:
- name: pre-install-job
@ -26,10 +30,10 @@ spec:
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 }}
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 }}
value: {{ required "env.secret.SECRET_KEY is a required value." .Values.env.secret.SECRET_KEY }}

View file

@ -9,7 +9,6 @@ data:
{{- range $k, $v := .Values.env.secret }}
{{ $k }}: {{ $v | b64enc | quote }}
{{- end }}
SECRET_KEY: {{ required "secretKey is a required value." .Values.secretKey | b64enc | quote }}
{{- if .Values.redis.enabled }}
REDIS_URL: {{ include "django.redis.url" . | b64enc | quote }}
{{- end }}