From fd7d5ad47a31ece1680f04a42fbc5d35a96a7ffd Mon Sep 17 00:00:00 2001
From: Dominik Kaminski <dominik.kaminski.extern@zendis.de>
Date: Tue, 19 Nov 2024 18:01:11 +0100
Subject: [PATCH] fix(helmfile): Add Redis username and tls option

---
 helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl      | 2 +-
 helmfile/apps/nubus/values-intercom-service.yaml.gotmpl   | 7 ++++++-
 helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl | 5 +++--
 helmfile/environments/default/cache.yaml                  | 7 +++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
index ba30ab7f..5570333f 100644
--- a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
@@ -55,7 +55,7 @@ aio:
       auth:
         enabled: true
         username:
-          value: "default"
+          value: {{ .Values.cache.nextcloud.username }}
         password:
           value: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password | quote }}
       host: {{ .Values.cache.nextcloud.host | quote }}
diff --git a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
index 303465b3..bebdad12 100644
--- a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
@@ -32,10 +32,15 @@ extraVolumeMounts:
   - name: "trusted-cert-secret-volume"
     mountPath: "/etc/ssl/certs/ca-certificates.crt"
     subPath: "ca-certificates.crt"
+{{- end }}
+
 extraEnvVars:
+  - name: "REDIS_USER"
+    value: {{ .Values.cache.intercomService.username }}
+  {{- if .Values.certificate.selfSigned }}
   - name: "NODE_EXTRA_CA_CERTS"
     value: "/etc/ssl/certs/ca-certificates.crt"
-{{- end }}
+  {{- end }}
 
 global:
   domain: {{ .Values.global.domain | quote }}
diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
index 9a8d89b2..141d76fe 100644
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -393,10 +393,11 @@ appsuite:
       enabled: true
       mode: "standalone"
       hosts:
-        - "redis-master:6379"
+        - {{ printf "%s:%s" .Values.cache.oxAppsuite.host .Values.cache.oxAppsuite.port | quote }}
       auth:
         enabled: true
-        password: {{ .Values.secrets.redis.password | quote }}
+        username: {{ .Values.cache.oxAppsuite.username | quote }}
+        password: {{ .Values.cache.oxAppsuite.password | default .Values.secrets.redis.password | quote }}
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.openxchangeCoreMW.registry | quote }}
       repository: {{ .Values.images.openxchangeCoreMW.repository | quote }}
diff --git a/helmfile/environments/default/cache.yaml b/helmfile/environments/default/cache.yaml
index 41e2ba99..b9fb206f 100644
--- a/helmfile/environments/default/cache.yaml
+++ b/helmfile/environments/default/cache.yaml
@@ -5,14 +5,21 @@ cache:
   intercomService:
     host: "redis-headless"
     port: 6379
+    username: "default"
     password: ""
   nextcloud:
     host: "redis-headless"
     port: 6379
+    username: "default"
     password: ""
   openproject:
     host: "memcached"
     port: 11211
+  oxAppsuite:
+    host: "redis-headless"
+    port: 6379
+    username: "default"
+    password: ""
   umsSelfservice:
     host: "memcached"
     port: 11211