From 76abe4a48d3eecf0c76c5ad060235cf15a049497 Mon Sep 17 00:00:00 2001
From: Tobias McNulty <tobias@caktusgroup.com>
Date: Wed, 10 Jul 2024 10:12:28 -0400
Subject: [PATCH] Update redis-ha subchart and enable haproxy

---
 charts/odk-central/Chart.lock                        |  8 ++++----
 charts/odk-central/Chart.yaml                        |  4 ++--
 .../charts/enketo/templates/deployment.yaml          |  7 +++++--
 .../odk-central/charts/enketo/templates/secret.yaml  | 11 +++++++++++
 charts/odk-central/values.yaml                       | 12 ++++++++++--
 5 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 charts/odk-central/charts/enketo/templates/secret.yaml

diff --git a/charts/odk-central/Chart.lock b/charts/odk-central/Chart.lock
index 9e1d4f2..388ad36 100644
--- a/charts/odk-central/Chart.lock
+++ b/charts/odk-central/Chart.lock
@@ -1,10 +1,10 @@
 dependencies:
 - name: redis-ha
   repository: https://dandydeveloper.github.io/charts
-  version: 4.23.0
+  version: 4.27.0
 - name: redis-ha
   repository: https://dandydeveloper.github.io/charts
-  version: 4.23.0
+  version: 4.27.0
 - name: enketo
   repository: file://charts/enketo
   version: 0.1.0
@@ -17,5 +17,5 @@ dependencies:
 - name: pyxform
   repository: file://charts/pyxform
   version: 0.1.0
-digest: sha256:49d8d9b862ffb1acf517a7ef65fc87f10fbc8948606761364eda4f692a3dd71c
-generated: "2024-01-09T13:52:08.550274-05:00"
+digest: sha256:02dc6413c6e5a8a5a54cc3a47d6f3a296040d403855d8011045c5447383801a6
+generated: "2024-07-10T09:46:03.904008-04:00"
diff --git a/charts/odk-central/Chart.yaml b/charts/odk-central/Chart.yaml
index f976a2f..e24c3df 100644
--- a/charts/odk-central/Chart.yaml
+++ b/charts/odk-central/Chart.yaml
@@ -26,12 +26,12 @@ appVersion: "1.16.0"
 dependencies:
   - name: redis-ha
     repository: https://dandydeveloper.github.io/charts
-    version: 4.23.0
+    version: 4.27.0
     alias: enketo-redis-main
     condition: enketo-redis-main.enabled
   - name: redis-ha
     repository: https://dandydeveloper.github.io/charts
-    version: 4.23.0
+    version: 4.27.0
     alias: enketo-redis-cache
     condition: enketo-redis-cache.enabled
   - name: enketo
diff --git a/charts/odk-central/charts/enketo/templates/deployment.yaml b/charts/odk-central/charts/enketo/templates/deployment.yaml
index c4a0cb2..2756c0b 100644
--- a/charts/odk-central/charts/enketo/templates/deployment.yaml
+++ b/charts/odk-central/charts/enketo/templates/deployment.yaml
@@ -59,17 +59,20 @@ spec:
             - name: HTTPS_PORT
               value: "{{ .Values.config.httpsPort }}"
             - name: REDIS_MAIN_HOST
-              value: '{{ .Values.config.redisMainHost | default (printf "%s-enketo-redis-main" .Release.Name) }}'
+              value: '{{ .Values.config.redisMainHost | default (printf "%s-enketo-redis-main-haproxy" .Release.Name) }}'
             - name: REDIS_MAIN_PORT
               value: "{{ .Values.config.redisMainPort }}"
             - name: REDIS_CACHE_HOST
-              value: '{{ .Values.config.redisCacheHost | default (printf "%s-enketo-redis-cache" .Release.Name) }}'
+              value: '{{ .Values.config.redisCacheHost | default (printf "%s-enketo-redis-cache-haproxy" .Release.Name) }}'
             - name: REDIS_CACHE_PORT
               value: "{{ .Values.config.redisCachePort }}"
             {{- if .Values.config.debug }}
             - name: DEBUG
               value: "enketo*"
             {{- end }}
+          envFrom:
+            - secretRef:
+                name: {{ include "enketo.fullname" . }}
           volumeMounts:
             - name: secret-volume
               readOnly: true
diff --git a/charts/odk-central/charts/enketo/templates/secret.yaml b/charts/odk-central/charts/enketo/templates/secret.yaml
new file mode 100644
index 0000000..7fec1f5
--- /dev/null
+++ b/charts/odk-central/charts/enketo/templates/secret.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "enketo.fullname" . }}
+  labels:
+    {{- include "enketo.labels" . | nindent 4 }}
+{{- with .Values.environmentVariables }}
+stringData:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+type: Opaque
diff --git a/charts/odk-central/values.yaml b/charts/odk-central/values.yaml
index 5c0f08f..3dd3250 100644
--- a/charts/odk-central/values.yaml
+++ b/charts/odk-central/values.yaml
@@ -15,8 +15,11 @@ global:
 
 enketo-redis-main:
   enabled: true
+  replicas: 3
 
-  replicas: 1
+  haproxy:
+    enabled: true
+    replicas: 3
 
   # use emptyDir to avoid tying pods to nodes during development
   # (not sure what this is used for, might be okay long-term too)
@@ -27,8 +30,11 @@ enketo-redis-main:
 
 enketo-redis-cache:
   enabled: true
+  replicas: 3
 
-  replicas: 1
+  haproxy:
+    enabled: true
+    replicas: 3
 
   # use emptyDir to avoid tying pods to nodes during development
   # (maybe okay long-term since this is just a cache?)
@@ -37,6 +43,8 @@ enketo-redis-cache:
   emptyDir:
     sizeLimit: 500Mi
 
+  environmentVariables:
+
 enketo:
   enabled: true