sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-08 00:11:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(helmfile): Unify database credentials

Browse Source 
Signed-off-by: Axel Lender <lender@b1-systems.de>
This commit is contained in:
Axel Lender
2025-07-09 15:41:03 +02:00
parent 0187c2571a
commit 03bb231e44
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
View File

@@ -111,17 +111,14 @@ configuration:
password: password:
{{- if or (eq .Values.databases.nextcloud.type "mariadb") (eq .Values.databases.nextcloud.type "mysql") }} {{- if or (eq .Values.databases.nextcloud.type "mariadb") (eq .Values.databases.nextcloud.type "mysql") }}
value: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }} value: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }}
secret:
name: {{ .Values.externalSecrets.mariadb.nextcloudUser.name | quote }}
key: {{ .Values.externalSecrets.mariadb.nextcloudUser.key | quote }}
{{- else if or (eq .Values.databases.nextcloud.type "postgresql") (eq .Values.databases.nextcloud.type "psql") }} {{- else if or (eq .Values.databases.nextcloud.type "postgresql") (eq .Values.databases.nextcloud.type "psql") }}
value: {{ .Values.databases.nextcloud.password | default .Values.secrets.postgresql.nextcloudUser | quote }} value: {{ .Values.databases.nextcloud.password | default .Values.secrets.postgresql.nextcloudUser | quote }}
secret:
name: {{ .Values.externalSecrets.postgresql.nextcloudUser.name | quote }}
key: {{ .Values.externalSecrets.postgresql.nextcloudUser.key | quote }}
{{- else }} {{- else }}
value: {{ .Values.databases.nextcloud.password | quote }} value: {{ .Values.databases.nextcloud.password | quote }}
{{- end }} {{- end }}
secret:
name: {{ .Values.externalSecrets.databases.nextcloud.password.name | quote }}
key: {{ .Values.externalSecrets.databases.nextcloud.password.key | quote }}
ldap: ldap:
base: {{ .Values.ldap.baseDn | quote }} base: {{ .Values.ldap.baseDn | quote }}

9
helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
View File

@@ -121,17 +121,14 @@ aio:
password: password:
{{- if or (eq .Values.databases.nextcloud.type "mariadb") (eq .Values.databases.nextcloud.type "mysql") }} {{- if or (eq .Values.databases.nextcloud.type "mariadb") (eq .Values.databases.nextcloud.type "mysql") }}
value: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }} value: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }}
secret:
name: {{ .Values.externalSecrets.mariadb.nextcloudUser.name | quote }}
key: {{ .Values.externalSecrets.mariadb.nextcloudUser.key | quote }}
{{- else if or (eq .Values.databases.nextcloud.type "postgresql") (eq .Values.databases.nextcloud.type "psql") }} {{- else if or (eq .Values.databases.nextcloud.type "postgresql") (eq .Values.databases.nextcloud.type "psql") }}
value: {{ .Values.databases.nextcloud.password | default .Values.secrets.postgresql.nextcloudUser | quote }} value: {{ .Values.databases.nextcloud.password | default .Values.secrets.postgresql.nextcloudUser | quote }}
secret:
name: {{ .Values.externalSecrets.postgresql.nextcloudUser.name | quote }}
key: {{ .Values.externalSecrets.postgresql.nextcloudUser.key | quote }}
{{- else }} {{- else }}
value: {{ .Values.databases.nextcloud.password | quote }} value: {{ .Values.databases.nextcloud.password | quote }}
{{- end }} {{- end }}
secret:
name: {{ .Values.externalSecrets.databases.nextcloud.password.name | quote }}
key: {{ .Values.externalSecrets.databases.nextcloud.password.key | quote }}
trustedProxy: {{ join " " .Values.cluster.networking.cidr | quote }} trustedProxy: {{ join " " .Values.cluster.networking.cidr | quote }}
containerSecurityContext: containerSecurityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false

11
helmfile/apps/xwiki/values.yaml.gotmpl
View File

@@ -45,18 +45,13 @@ externalDB:
user: {{ .Values.databases.xwiki.username | quote }} user: {{ .Values.databases.xwiki.username | quote }}
host: {{ printf "%s:%d" .Values.databases.xwiki.host .Values.databases.xwiki.port | quote }} host: {{ printf "%s:%d" .Values.databases.xwiki.host .Values.databases.xwiki.port | quote }}
customKeyRef: customKeyRef:
{{- if or (.Values.externalSecrets.mariadb.rootPassword.name) (.Values.externalSecrets.postgresql.xwikiUser.name) }} {{- if .Values.externalSecrets.databases.xwiki.password.name }}
enabled: true enabled: true
name: {{ .Values.externalSecrets.databases.xwiki.password.name | quote }}
key: {{ .Values.externalSecrets.databases.xwiki.password.key | quote }}
{{- else }} {{- else }}
enabled: false enabled: false
{{- end }} {{- end }}
{{- if eq .Values.databases.xwiki.type "mariadb" }}
name: {{ .Values.externalSecrets.mariadb.rootPassword.name | quote }}
key: {{ .Values.externalSecrets.mariadb.rootPassword.key | quote }}
{{- else }}
name: {{ .Values.externalSecrets.postgresql.xwikiUser.name | quote }}
key: {{ .Values.externalSecrets.postgresql.xwikiUser.key | quote }}
{{- end }}
securityContext: securityContext:
enabled: true enabled: true