From e935541b40a9eb105bb18cf0dc1c53d851e61e11 Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Sun, 2 Feb 2020 17:29:14 -0500
Subject: [PATCH] closer

---
 templates/_helpers.tpl        | 49 +++++++++++++++++++++++++++++++++++
 templates/secrets.yaml        |  2 +-
 templates/web-deployment.yaml |  2 ++
 values.yaml                   |  6 +++--
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 76c77d0..e3cb6bd 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -61,3 +61,52 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "glitchtip.postgresql.fullname" -}}
+{{- if .Values.postgresql.fullnameOverride -}}
+{{- .Values.postgresql.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.postgresql.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name "glitchtip-postgresql" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- define "glitchtip.redis.fullname" -}}
+{{- if .Values.redis.fullnameOverride -}}
+{{- .Values.redis.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.redis.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name "glitchtip-redis" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set redis host
+*/}}
+{{- define "glitchtip.redis.host" -}}
+{{- if .Values.redis.enabled -}}
+{{- template "glitchtip.redis.fullname" . -}}-master
+{{- else -}}
+{{- .Values.redis.host | quote -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set redis url
+*/}}
+{{- define "glitchtip.redis.url" -}}
+{{- if .Values.redis.enabled -}}
+redis://{{- template "glitchtip.redis.password" -}}{{- template "glitchtip.redis.fullname" . -}}-master
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/templates/secrets.yaml b/templates/secrets.yaml
index 7a9cac3..0641d3f 100644
--- a/templates/secrets.yaml
+++ b/templates/secrets.yaml
@@ -8,4 +8,4 @@ type: Opaque
 data:
   DATABASE_URL: {{ required "databaseURL is a required value." .Values.databaseURL | b64enc | quote }}
   SECRET_KEY: {{ required "secretKey is a required value." .Values.secretKey | b64enc | quote }}
-  REDIS_URL: "redis"
\ No newline at end of file
+  REDIS_URL: {{ printf "redis://:@glitchtip-staging-glitchtip-redis-master:6379/0" | b64enc | quote }}
\ No newline at end of file
diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
index d014b71..7cf24a1 100644
--- a/templates/web-deployment.yaml
+++ b/templates/web-deployment.yaml
@@ -9,10 +9,12 @@ spec:
   selector:
     matchLabels:
       {{- include "glitchtip.selectorLabels" . | nindent 6 }}
+      role: web
   template:
     metadata:
       labels:
         {{- include "glitchtip.selectorLabels" . | nindent 8 }}
+        role: web
       annotations:
         checksum/secrets.yaml: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
     spec:
diff --git a/values.yaml b/values.yaml
index a121e67..61b45eb 100644
--- a/values.yaml
+++ b/values.yaml
@@ -12,15 +12,16 @@ nameOverride: ""
 fullnameOverride: ""
 databaseURL:
 secretKey:
+# redisURL:
 enableSocialAuth: false
 
 web:
+  replicaCount: 1
   hpa:
     enabled: false
     cputhreshold: 60
     minpods: 1
     maxpods: 10
-  replicaCount: 1
   resources: {}
     # limits:
     #   cpu: 500m
@@ -52,7 +53,7 @@ worker:
 
 serviceAccount:
   # Specifies whether a service account should be created
-  create: true
+  create: false
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name:
@@ -76,6 +77,7 @@ ingress:
 
 redis:
   enabled: true
+  nameOverride: glitchtip-redis
   master:
     persistence:
       enabled: false