From 7b0ec0c33ff98005cd84a9edf863f27ea254e7e6 Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Fri, 21 May 2021 09:07:35 -0400
Subject: [PATCH] Trying this out

---
 templates/_helpers.tpl        |  6 +++---
 templates/configmap.yaml      |  3 ++-
 templates/secrets.yaml        | 12 +++++-------
 templates/web/deployment.yaml | 15 ---------------
 values.yaml                   | 17 +++++++----------
 5 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 2734712..0c0662b 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -107,7 +107,7 @@ Set redis url
 */}}
 {{- define "django.redis.url" -}}
 {{- if .Values.redis.enabled -}}
-redis://{{- template "django.redis.password" -}}{{- template "django.redis.fullname" . -}}-master
+redis://:{{ .Values.redis.password }}@{{- template "django.redis.fullname" . -}}-redis-master:{{- template "django.redis.port" . -}}/0
 {{- end -}}
 {{- end -}}
 
@@ -116,8 +116,8 @@ Set redis port
 */}}
 {{- define "django.redis.port" -}}
 {{- if .Values.redis.enabled -}}
-    "6379"
+    6379
 {{- else -}}
-{{- default "6379" .Values.redis.port | quote -}}
+{{- default "6379" .Values.redis.port -}}
 {{- end -}}
 {{- end -}}
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index 6b57ab6..a5674d3 100644
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -7,6 +7,7 @@ metadata:
   annotations:
     "helm.sh/hook-weight": "-1"
 data:
-{{- range $k, $v := .Values.environmentVariables }}
+{{- range $k, $v := .Values.env.normal }}
   {{ $k }}: {{ $v | quote }}
 {{- end }}
+  REDIS_URL: {{ template "django.redis.url" . }}
diff --git a/templates/secrets.yaml b/templates/secrets.yaml
index 505738f..aa6611a 100644
--- a/templates/secrets.yaml
+++ b/templates/secrets.yaml
@@ -6,12 +6,10 @@ metadata:
     {{- include "django.labels" . | nindent 4 }}
 type: Opaque
 data:
-  DATABASE_URL: {{ required "databaseURL is a required value." .Values.databaseURL | b64enc | quote }}
+{{- range $k, $v := .Values.env.secret }}
+  {{ $k }}: {{ $v | b64enc | quote }}
+{{- end }}
   SECRET_KEY: {{ required "secretKey is a required value." .Values.secretKey | b64enc | quote }}
-  REDIS_URL: {{ printf "redis://:@glitchtip-staging-redis-master:6379/0" | b64enc | quote }}
-{{- if .Values.stripeLiveSecretKey }}
-  STRIPE_LIVE_SECRET_KEY: {{ .Values.stripeLiveSecretKey | b64enc | quote }}
-{{- end }}
-{{- if .Values.djstripeWebhookSecret }}
-  DJSTRIPE_WEBHOOK_SECRET: {{ .Values.djstripeWebhookSecret | b64enc | quote }}
+{{- if .Values.redis.enabled }}
+  REDIS_URL: {{ template "django.redis.url" . | b64enc | quote }}
 {{- end }}
diff --git a/templates/web/deployment.yaml b/templates/web/deployment.yaml
index 8d109d3..706bac8 100644
--- a/templates/web/deployment.yaml
+++ b/templates/web/deployment.yaml
@@ -57,21 +57,6 @@ spec:
           resources:
             {{- toYaml .Values.web.resources | nindent 12 }}
           env:
-            {{- 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 }}
             - name: POD_IP
               valueFrom:
                 fieldRef:
diff --git a/values.yaml b/values.yaml
index 43733a2..7e500da 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1,4 +1,4 @@
-# Default values for glitchtip.
+# Default values for django.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -10,16 +10,13 @@ image:
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
-databaseURL:
-secretKey:
-redisURL:
-# Only needed when using stripe for saas environment
-stripeLiveSecretKey:
-djstripeWebhookSecret: 
 
-environmentVariables:
-  ENABLE_SOCIAL_AUTH: false
-  GLITCHTIP_DOMAIN: https://example.com
+secretKey:
+env:
+  normal: []
+  secrets: []
+    # DATABASE_URL:
+    # REDIS_URL:
 
 web:
   replicaCount: 2