Helm: Fix helm chart rendering when authentication is enabled

.gitignore

@@ -126,4 +126,5 @@ Thumbs.db
 output
 package-lock.json
 helm/core-ui-middleware/charts/
+helm/core-ui-middleware/Chart.lock
 .pnpm-store

helm/core-ui-middleware/Chart.lock

-dependencies:
-- name: ox-common
-  repository: oci://registry.open-xchange.com/appsuite-core-internal/charts
-  version: 1.0.41
-digest: sha256:c86cf38308398f1458863f3b6f8f9aa35effd251df7ba847547b40dacdaab99e
-generated: "2024-05-16T10:39:00.523895345Z"

helm/core-ui-middleware/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.9
+version: 3.0.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/core-ui-middleware/templates/deployment.yaml

@@ -139,10 +139,29 @@ spec:
               value: "{{ .Values.redis.hosts | join "," }}"
             - name: REDIS_DB
               value: "{{ .Values.redis.db | int }}"
+            {{- if .Values.redis.auth.enabled }}
+            - name: REDIS_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "core-ui-middleware.redisSecret" . }}
+                  key: username
             - name: REDIS_PASSWORD
-              value: "{{ .Values.redis.password }}"
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "core-ui-middleware.redisSecret" . }}
+                  key: password
+            {{- end }}
             - name: REDIS_PREFIX
               value: "{{ .Values.redis.prefix }}"
+            - name: REDIS_TLS_ENABLED
+              value: "{{ .Values.redis.tls.enabled }}"
+            {{- if .Values.redis.tls.enabled }}
+            - name: REDIS_TLS_CA
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "core-ui-middleware.redisSecret" . }}
+                  key: ca.crt
+            {{- end }}
           resources:
             {{- toYaml .Values.updater.resources | nindent 12 }}
           volumeMounts:

helm/core-ui-middleware/templates/redis-secret.yaml

-{{- if or .Values.redis.auth.enabled  .Values.redis.tls.enabled -}}
+{{- if and (or .Values.redis.auth.enabled .Values.redis.tls.enabled) (not .Values.overrides.redisSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,5 +7,7 @@ type: Opaque
 data:
   username: {{ .Values.redis.auth.username | b64enc | quote }}
   password: {{ .Values.redis.auth.password | b64enc | quote }}
+  {{- if and .Values.redis.tls.enabled .Values.redis.tls.ca }}
   ca.crt: {{ .Values.redis.tls.ca | b64enc | quote }}
+  {{- end }}
 {{- end -}}

helm/core-ui-middleware/values.yaml

@@ -14,7 +14,7 @@ defaultRegistry: registry.open-xchange.com
 containerPort: 8080
 
 image:
-  repository: "core-ui-middleware"
+  repository: "appsuite-core-internal/core-ui-middleware"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -22,6 +22,8 @@ image:
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
+overrides: {}
+#  redisSecret: ""
 
 podAnnotations:
   logging.open-xchange.com/format: "appsuite-json"