fix(helmfile): Add Redis username and tls option

This commit is contained in:
Dominik Kaminski
2024-11-19 18:01:11 +01:00
committed by Thorsten Roßner
parent 9e102e2d1b
commit 564fb2d7c7
4 changed files with 17 additions and 4 deletions

View File

@@ -55,7 +55,7 @@ aio:
auth: auth:
enabled: true enabled: true
username: username:
value: "default" value: {{ .Values.cache.nextcloud.username }}
password: password:
value: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password | quote }} value: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password | quote }}
host: {{ .Values.cache.nextcloud.host | quote }} host: {{ .Values.cache.nextcloud.host | quote }}

View File

@@ -32,10 +32,15 @@ extraVolumeMounts:
- name: "trusted-cert-secret-volume" - name: "trusted-cert-secret-volume"
mountPath: "/etc/ssl/certs/ca-certificates.crt" mountPath: "/etc/ssl/certs/ca-certificates.crt"
subPath: "ca-certificates.crt" subPath: "ca-certificates.crt"
{{- end }}
extraEnvVars: extraEnvVars:
- name: "REDIS_USER"
value: {{ .Values.cache.intercomService.username }}
{{- if .Values.certificate.selfSigned }}
- name: "NODE_EXTRA_CA_CERTS" - name: "NODE_EXTRA_CA_CERTS"
value: "/etc/ssl/certs/ca-certificates.crt" value: "/etc/ssl/certs/ca-certificates.crt"
{{- end }} {{- end }}
global: global:
domain: {{ .Values.global.domain | quote }} domain: {{ .Values.global.domain | quote }}

View File

@@ -393,10 +393,11 @@ appsuite:
enabled: true enabled: true
mode: "standalone" mode: "standalone"
hosts: hosts:
- "redis-master:6379" - {{ printf "%s:%s" .Values.cache.oxAppsuite.host .Values.cache.oxAppsuite.port | quote }}
auth: auth:
enabled: true 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: image:
registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.openxchangeCoreMW.registry | quote }} registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.openxchangeCoreMW.registry | quote }}
repository: {{ .Values.images.openxchangeCoreMW.repository | quote }} repository: {{ .Values.images.openxchangeCoreMW.repository | quote }}

View File

@@ -5,14 +5,21 @@ cache:
intercomService: intercomService:
host: "redis-headless" host: "redis-headless"
port: 6379 port: 6379
username: "default"
password: "" password: ""
nextcloud: nextcloud:
host: "redis-headless" host: "redis-headless"
port: 6379 port: 6379
username: "default"
password: "" password: ""
openproject: openproject:
host: "memcached" host: "memcached"
port: 11211 port: 11211
oxAppsuite:
host: "redis-headless"
port: 6379
username: "default"
password: ""
umsSelfservice: umsSelfservice:
host: "memcached" host: "memcached"
port: 11211 port: 11211