From c91c97f1c7bb3d1416913ae6abca4756913d94b1 Mon Sep 17 00:00:00 2001
From: Jorgen Evens <jorgen@evens.eu>
Date: Wed, 10 Aug 2022 16:46:05 +0200
Subject: [PATCH] feat(redis): cleanup REDIS_STRING generation

---
 .../charts/assets/templates/deployment.yaml   | 17 +-------------
 .../charts/db/templates/deployment.yaml       | 17 +-------------
 .../charts/ender/templates/deployment.yaml    | 17 +-------------
 .../charts/frontend/templates/deployment.yaml | 17 +-------------
 .../heuristics/templates/deployment.yaml      | 17 +-------------
 .../charts/http/templates/deployment.yaml     | 17 +-------------
 .../integrations/templates/deployment.yaml    | 17 +-------------
 .../charts/sink/templates/deployment.yaml     | 17 +-------------
 .../charts/storage/templates/deployment.yaml  | 17 +-------------
 .../openreplay/templates/_helpers.tpl         | 23 +++++++++++++++++++
 10 files changed, 32 insertions(+), 144 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
index d722997b1..348a166c9 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
@@ -69,22 +69,6 @@ spec:
               value: '{{ .Values.global.s3.endpoint }}'
             - name: AWS_REGION
               value: '{{ .Values.global.s3.region }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -109,6 +93,7 @@ spec:
               # S3 compatible storage
               value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
             {{- end }}
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml
index 5cd90ec09..ba1620a6d 100644
--- a/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml
@@ -47,22 +47,6 @@ spec:
               value: '{{ .Values.global.clickhouse.chHost }}:{{.Values.global.clickhouse.service.webPort}}/{{.Values.env.ch_db}}'
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -80,6 +64,7 @@ spec:
               value: '{{ .Values.global.quickwit.enabled }}'
             - name: POSTGRES_STRING
               value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:$(pg_password)@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml
index a2c101cd9..05487bd75 100644
--- a/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml
@@ -45,22 +45,6 @@ spec:
           env:
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -76,6 +60,7 @@ spec:
               {{- end}}
             - name: POSTGRES_STRING
               value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:$(pg_password)@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
index aa782c023..4c4f8dbb9 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
@@ -65,22 +65,6 @@ spec:
               value: '{{ .Values.global.s3.region }}'
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -116,6 +100,7 @@ spec:
               # S3 compatible storage
               value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
             {{- end }}
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml
index fc33efe24..1d3d1cd8c 100644
--- a/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml
@@ -45,26 +45,11 @@ spec:
           env:
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
               value: '{{ .Values.global.kafka.kafkaUseSsl }}'
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
index 81a144003..2bc61d3cc 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
@@ -65,22 +65,6 @@ spec:
               value: '{{ .Values.global.s3.region }}'
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -116,6 +100,7 @@ spec:
               # S3 compatible storage
               value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
             {{- end }}
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml
index b80e246f9..1e0ff879f 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml
@@ -45,22 +45,6 @@ spec:
           env:
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -76,6 +60,7 @@ spec:
               {{- end}}
             - name: POSTGRES_STRING
               value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:$(pg_password)@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
index d8c2e406b..44494f434 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
@@ -45,22 +45,6 @@ spec:
           env:
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
@@ -85,6 +69,7 @@ spec:
               # S3 compatible storage
               value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
             {{- end }}
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
index 46a1b9700..8cf8784ef 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
@@ -73,26 +73,11 @@ spec:
               value: {{ .Values.global.s3.recordingsBucket }}
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
-            {{- if .Values.global.redis.existingSecret }}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.redis.existingSecret }}
-                  key: redis-password
-            {{- else if .Values.global.redis.redisPassword }}
-            - name: REDIS_PASSWORD
-              value: {{ .Values.global.redis.redisPassword }}
-            {{- end}}
-            - name: REDIS_STRING
-              {{- if or .Values.global.redis.existingSecret .Values.global.redis.redisPassword }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisUsername }}:$(REDIS_PASSWORD)@{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- else }}
-              value: '{{ ternary "rediss" "redis" .Values.global.redis.tls.enabled }}://{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
-              {{- end}}
             - name: KAFKA_SERVERS
               value: '{{ .Values.global.kafka.kafkaHost }}:{{ .Values.global.kafka.kafkaPort }}'
             - name: KAFKA_USE_SSL
               value: '{{ .Values.global.kafka.kafkaUseSsl }}'
+            {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/templates/_helpers.tpl b/scripts/helmcharts/openreplay/templates/_helpers.tpl
index ea4e67add..87ad3fd5c 100644
--- a/scripts/helmcharts/openreplay/templates/_helpers.tpl
+++ b/scripts/helmcharts/openreplay/templates/_helpers.tpl
@@ -60,3 +60,26 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the environment configuration for REDIS_STRING
+*/}}
+{{- define "openreplay.env.redis_string" -}}
+{{- $scheme := (eq .tls.enabled true) | ternary "rediss" "redis" -}}
+{{- $auth := "" -}}
+{{- if or .existingSecret .redisPassword -}}
+  {{- $auth = printf "%s:$(REDIS_PASSWORD)@" (.redisUsername | default "") -}}
+{{- end -}}
+{{- if .existingSecret -}}
+- name: REDIS_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ .existingSecret }}
+      key: redis-password
+{{- else if .redisPassword }}
+- name: REDIS_PASSWORD
+  value: {{ .redisPassword }}
+{{- end}}
+- name: REDIS_STRING
+  value: '{{ $scheme }}://{{ $auth }}{{ .redisHost }}:{{ .redisPort }}'
+{{- end }}