KuroNET/django-helm-chart
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Check in

Browse source
This commit is contained in:
David Burke 2021-05-21 10:31:02 -04:00
parent 7b0ec0c33f
commit 3dec18d924
6 changed files with 14 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
templates/_helpers.tpl
View file

@ -91,6 +91,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- end -}}
{{- end -}}
{{/*
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 }}
{{- end -}}
{{- end -}}
{{/*
Set redis host
*/}}

15
templates/beat/deployment.yaml
View file

@ -43,21 +43,6 @@ spec:
env:
- name: SERVER_ROLE
value: "beat"
{{- if .Values.redisURL }}
- name: REDIS_URL
value: {{ .Values.redisURL }}
{{- end }}
{{- if .Values.redis.enabled }}
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
key: redis-password
name: {{ include "django.fullname" . }}-redis
- name: REDIS_HOST
value: {{ template "django.redis.host" . }}
- name: REDIS_PORT
value: {{ template "django.redis.port" . }}
{{- end }}
envFrom:
- secretRef:
name: {{ include "django.fullname" . }}

1
templates/configmap.yaml
View file

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

4
templates/pre-install-job.yaml
View file

@ -24,9 +24,7 @@ spec:
env:
- name: DEBUG
value: "False"
- name: STATIC_URL
value: /
- name: DATABASE_URL
value: {{ required "databaseURL is a required value." .Values.databaseURL }}
value: {{ required "env.secret.DATABASE_URL is a required value." .Values.env.secret.DATABASE_URL }}
- name: SECRET_KEY
value: {{ required "secretKey is a required value." .Values.secretKey }}

5
templates/secrets.yaml
View file

@ -11,5 +11,8 @@ data:
{{- end }}
SECRET_KEY: {{ required "secretKey is a required value." .Values.secretKey | b64enc | quote }}
{{- if .Values.redis.enabled }}
REDIS_URL: {{ template "django.redis.url" . | b64enc | quote }}
REDIS_URL: {{ include "django.redis.url" . | b64enc | quote }}
{{- end }}
{{- if .Values.postgresql.enabled }}
DATABASE_URL: {{ include "django.postgresql.url" . | b64enc | quote }}
{{- end }}

15
templates/worker/deployment.yaml
View file

@ -38,21 +38,6 @@ spec:
env:
- name: SERVER_ROLE
value: "worker"
{{- if .Values.redisURL }}
- name: REDIS_URL
value: {{ .Values.redisURL }}
{{- end }}
{{- if .Values.redis.enabled }}
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
key: redis-password
name: {{ include "django.fullname" . }}-redis
- name: REDIS_HOST
value: {{ template "django.redis.host" . }}
- name: REDIS_PORT
value: {{ template "django.redis.port" . }}
{{- end }}
envFrom:
- secretRef:
name: {{ include "django.fullname" . }}