From d297c555f37161988b0887886e390a93a7ebc67b Mon Sep 17 00:00:00 2001
From: Lucas Hahn <lucas.hahn@novum-rgi.de>
Date: Mon, 12 Jul 2021 11:50:00 +0200
Subject: [PATCH] Fix redis-cluster settings

---
 templates/_helpers.tpl | 2 +-
 values.yaml            | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 269e15a..c5ba01f 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -113,7 +113,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 
 {{- define "redis.dns" -}}
 {{- if (index .Values "redis-cluster").enabled -}}
-{{- printf "redis://:%s@%s-redis-cluster-headless.%s.svc.%s:%g/0?pool_size=100&idle_timeout=180s" (index .Values "redis-cluster").global.redis.password .Release.Name .Release.Namespace .Values.clusterDomain (index .Values "redis-cluster").service.port -}}
+{{- printf "redis+cluster://:%s@%s-redis-cluster-headless.%s.svc.%s:%g/0?pool_size=100&idle_timeout=180s&" (index .Values "redis-cluster").global.redis.password .Release.Name .Release.Namespace .Values.clusterDomain (index .Values "redis-cluster").service.port -}}
 {{- else if .Values.redis.enabled -}}
 {{- printf "redis://:%s@%s-redis-master.%s.svc.%s:%g/0?pool_size=100&idle_timeout=180s" .Values.redis.global.redis.password .Release.Name .Release.Namespace .Values.clusterDomain .Values.redis.master.service.port -}}
 {{- end -}}
diff --git a/values.yaml b/values.yaml
index e5e34a5..fe3fd62 100644
--- a/values.yaml
+++ b/values.yaml
@@ -264,6 +264,7 @@ redis:
 
 redis-cluster:
   enabled: false
+  password: gitea
   global:
     redis:
       password: gitea
@@ -286,6 +287,11 @@ postgresql:
 
 postgresql-ha:
   enabled: false
+  postgresql:
+    password: gitea
+    repmgrPassword: gitea
+  pgpool:
+    adminPassword: gitea
   global:
     postgresql:
       database: gitea