From c910ea050f63e70ad74e567230e2fe487e4345b7 Mon Sep 17 00:00:00 2001 From: pat-s Date: Tue, 2 Jul 2024 09:10:16 +0200 Subject: [PATCH] minor edits --- templates/_helpers.tpl | 2 +- unittests/config/queue-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 22dfa10..d8dfd7d 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -114,7 +114,7 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- define "redis.dns" -}} {{- if and ((index .Values "redis-cluster").enabled) ((index .Values "redis").enabled) -}} -{{- fail "redis AND redis-cluster can't be both enabled" -}} +{{- fail "redis and redis-cluster cannot be enabled at the same time. Please only choose one." -}} {{- else if (index .Values "redis-cluster").enabled -}} {{- 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.ports.redis -}} {{- else if (index .Values "redis").enabled -}} diff --git a/unittests/config/queue-config.yaml b/unittests/config/queue-config.yaml index d8fe019..b4946c7 100644 --- a/unittests/config/queue-config.yaml +++ b/unittests/config/queue-config.yaml @@ -48,7 +48,7 @@ tests: CONN_STR= TYPE=level - - it: "queue can be customized when redis (and redis-cluster) is disabled" + - it: "queue can be customized when redis (and redis-cluster) are disabled" template: templates/gitea/config.yaml set: redis-cluster: