From 3dec18d924f462116596747d0d16650abe22e1d4 Mon Sep 17 00:00:00 2001 From: David Burke Date: Fri, 21 May 2021 10:31:02 -0400 Subject: [PATCH] Check in --- templates/_helpers.tpl | 9 +++++++++ templates/beat/deployment.yaml | 15 --------------- templates/configmap.yaml | 1 - templates/pre-install-job.yaml | 4 +--- templates/secrets.yaml | 5 ++++- templates/worker/deployment.yaml | 15 --------------- 6 files changed, 14 insertions(+), 35 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 0c0662b..636ed20 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -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 */}} diff --git a/templates/beat/deployment.yaml b/templates/beat/deployment.yaml index 5a15e24..bdebde3 100644 --- a/templates/beat/deployment.yaml +++ b/templates/beat/deployment.yaml @@ -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" . }} diff --git a/templates/configmap.yaml b/templates/configmap.yaml index a5674d3..059f000 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -10,4 +10,3 @@ data: {{- range $k, $v := .Values.env.normal }} {{ $k }}: {{ $v | quote }} {{- end }} - REDIS_URL: {{ template "django.redis.url" . }} diff --git a/templates/pre-install-job.yaml b/templates/pre-install-job.yaml index e539a9e..d8498c8 100644 --- a/templates/pre-install-job.yaml +++ b/templates/pre-install-job.yaml @@ -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 }} diff --git a/templates/secrets.yaml b/templates/secrets.yaml index aa6611a..e9974f2 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -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 }} \ No newline at end of file diff --git a/templates/worker/deployment.yaml b/templates/worker/deployment.yaml index f114446..ddcccd8 100644 --- a/templates/worker/deployment.yaml +++ b/templates/worker/deployment.yaml @@ -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" . }}