fix(helmfile): Quote all password template strings

This commit is contained in:
Dominik Kaminski
2023-10-11 16:05:57 +02:00
parent 72e3afdffd
commit fb7dba787c
21 changed files with 50 additions and 50 deletions

View File

@@ -29,7 +29,7 @@ ingress:
collabora: collabora:
# Admin Console Credentials: https://CODE-domain/browser/dist/admin/admin.html # Admin Console Credentials: https://CODE-domain/browser/dist/admin/admin.html
username: "collabora-internal-admin" username: "collabora-internal-admin"
password: {{ .Values.secrets.collabora.adminPassword }} password: {{ .Values.secrets.collabora.adminPassword | quote }}
aliasgroups: aliasgroups:
- host: "https://{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}:443" - host: "https://{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}:443"

View File

@@ -22,7 +22,7 @@ configuration:
host: "{{ .Values.databases.synapse.host }}" host: "{{ .Values.databases.synapse.host }}"
name: "{{ .Values.databases.synapse.name }}" name: "{{ .Values.databases.synapse.name }}"
user: "{{ .Values.databases.synapse.username }}" user: "{{ .Values.databases.synapse.username }}"
password: "{{ .Values.databases.synapse.password | default .Values.secrets.postgresql.matrixUser }}" password: {{ .Values.databases.synapse.password | default .Values.secrets.postgresql.matrixUser | quote }}
homeserver: homeserver:
oidc: oidc:
@@ -41,7 +41,7 @@ configuration:
port: {{ .Values.turn.server.port }} port: {{ .Values.turn.server.port }}
transport: {{ .Values.turn.transport }} transport: {{ .Values.turn.transport }}
{{- end }} {{- end }}
guestModule: guestModule:
image: image:
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"

View File

@@ -27,7 +27,7 @@ ics:
redis: redis:
host: {{ .Values.cache.intercomService.host }} host: {{ .Values.cache.intercomService.host }}
port: {{ .Values.cache.intercomService.port }} port: {{ .Values.cache.intercomService.port }}
password: {{ .Values.cache.intercomService.password | default .Values.secrets.redis.password }} password: {{ .Values.cache.intercomService.password | default .Values.secrets.redis.password | quote }}
openxchange: openxchange:
url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}" url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"

View File

@@ -86,7 +86,7 @@ jitsi:
repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.jicofo.repository }}" repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.jicofo.repository }}"
tag: "{{ .Values.images.jicofo.tag }}" tag: "{{ .Values.images.jicofo.tag }}"
xmpp: xmpp:
password: "{{ .Values.secrets.jitsi.jicofoAuthPassword }}" password: {{ .Values.secrets.jitsi.jicofoAuthPassword | quote }}
componentSecret: "{{ .Values.secrets.jitsi.jicofoComponentPassword }}" componentSecret: "{{ .Values.secrets.jitsi.jicofoComponentPassword }}"
resources: resources:
{{ .Values.resources.jicofo | toYaml | nindent 6 }} {{ .Values.resources.jicofo | toYaml | nindent 6 }}

View File

@@ -17,7 +17,7 @@ cleanup:
config: config:
administrator: administrator:
password: "{{ .Values.secrets.keycloak.adminPassword }}" password: {{ .Values.secrets.keycloak.adminPassword | quote }}
image: image:
registry: "{{ .Values.global.imageRegistry }}" registry: "{{ .Values.global.imageRegistry }}"

View File

@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
--- ---
global: global:
keycloak: keycloak:
adminPassword: {{ .Values.secrets.keycloak.adminPassword }} adminPassword: {{ .Values.secrets.keycloak.adminPassword | quote }}
postgresql: postgresql:
connection: connection:
host: "{{ .Values.databases.keycloakExtension.host }}" host: "{{ .Values.databases.keycloakExtension.host }}"
@@ -13,7 +13,7 @@ global:
auth: auth:
database: "{{ .Values.databases.keycloakExtension.name }}" database: "{{ .Values.databases.keycloakExtension.name }}"
username: "{{ .Values.databases.keycloakExtension.username }}" username: "{{ .Values.databases.keycloakExtension.username }}"
password: {{ .Values.databases.keycloakExtension.password | default .Values.secrets.postgresql.keycloakExtensionUser }} password: {{ .Values.databases.keycloakExtension.password | default .Values.secrets.postgresql.keycloakExtensionUser | quote }}
handler: handler:
image: image:
registry: "{{ .Values.global.imageRegistry }}" registry: "{{ .Values.global.imageRegistry }}"
@@ -21,7 +21,7 @@ handler:
tag: "{{ .Values.images.keycloakExtensionHandler.tag }}" tag: "{{ .Values.images.keycloakExtensionHandler.tag }}"
imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
appConfig: appConfig:
smtpPassword: "{{ .Values.smtp.password }}" smtpPassword: {{ .Values.smtp.password | quote }}
smtpHost: "{{ .Values.smtp.host }}" smtpHost: "{{ .Values.smtp.host }}"
smtpUsername: "{{ .Values.smtp.username }}" smtpUsername: "{{ .Values.smtp.username }}"
mailFrom: "noreply@{{ .Values.global.domain }}" mailFrom: "noreply@{{ .Values.global.domain }}"

View File

@@ -20,10 +20,10 @@ externalDatabase:
port: {{ .Values.databases.keycloak.port }} port: {{ .Values.databases.keycloak.port }}
user: "{{ .Values.databases.keycloak.username }}" user: "{{ .Values.databases.keycloak.username }}"
database: "{{ .Values.databases.keycloak.name }}" database: "{{ .Values.databases.keycloak.name }}"
password: {{ .Values.databases.keycloak.password | default .Values.secrets.postgresql.keycloakUser }} password: {{ .Values.databases.keycloak.password | default .Values.secrets.postgresql.keycloakUser | quote }}
auth: auth:
adminPassword: {{ .Values.secrets.keycloak.adminPassword }} adminPassword: {{ .Values.secrets.keycloak.adminPassword | quote }}
replicaCount: {{ .Values.replicas.keycloak }} replicaCount: {{ .Values.replicas.keycloak }}

View File

@@ -14,7 +14,7 @@ global:
config: config:
administrator: administrator:
password: {{ .Values.secrets.nextcloud.adminPassword }} password: {{ .Values.secrets.nextcloud.adminPassword | quote }}
antivirus: antivirus:
{{- if .Values.clamavDistributed.enabled }} {{- if .Values.clamavDistributed.enabled }}
@@ -25,15 +25,15 @@ config:
apps: apps:
integrationSwp: integrationSwp:
password: {{ .Values.secrets.centralnavigation.apiKey }} password: {{ .Values.secrets.centralnavigation.apiKey | quote }}
userOidc: userOidc:
password: {{ .Values.secrets.keycloak.clientSecret.ncoidc }} password: {{ .Values.secrets.keycloak.clientSecret.ncoidc | quote }}
database: database:
host: "{{ .Values.databases.nextcloud.host }}" host: "{{ .Values.databases.nextcloud.host }}"
name: "{{ .Values.databases.nextcloud.name }}" name: "{{ .Values.databases.nextcloud.name }}"
user: "{{ .Values.databases.nextcloud.username }}" user: "{{ .Values.databases.nextcloud.username }}"
password: "{{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser }}" password: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }}
ldapSearch: ldapSearch:
password: "{{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud }}" password: "{{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud }}"

View File

@@ -6,20 +6,20 @@ SPDX-License-Identifier: Apache-2.0
nextcloud: nextcloud:
host: "{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}" host: "{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}"
username: "nextcloud" username: "nextcloud"
password: {{ .Values.secrets.nextcloud.adminPassword }} password: {{ .Values.secrets.nextcloud.adminPassword | quote }}
externalDatabase: externalDatabase:
database: "{{ .Values.databases.nextcloud.name }}" database: "{{ .Values.databases.nextcloud.name }}"
user: "{{ .Values.databases.nextcloud.username }}" user: "{{ .Values.databases.nextcloud.username }}"
host: "{{ .Values.databases.nextcloud.host }}" host: "{{ .Values.databases.nextcloud.host }}"
password: "{{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser }}" password: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }}
extraEnv: extraEnv:
REDIS_HOST: {{ .Values.cache.nextcloud.host | quote }} REDIS_HOST: {{ .Values.cache.nextcloud.host | quote }}
REDIS_HOST_PORT: {{ .Values.cache.nextcloud.port | quote }} REDIS_HOST_PORT: {{ .Values.cache.nextcloud.port | quote }}
REDIS_HOST_PASSWORD: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password }} REDIS_HOST_PASSWORD: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password | quote }}
redis: redis:
auth: auth:
enabled: true enabled: true
password: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password }} password: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password | quote }}
ingress: ingress:
enabled: {{ .Values.ingress.enabled }} enabled: {{ .Values.ingress.enabled }}
className: {{ .Values.ingress.ingressClassName }} className: {{ .Values.ingress.ingressClassName }}

View File

@@ -16,10 +16,10 @@ imagePullSecrets:
dovecot: dovecot:
mailDomain: "{{ .Values.global.domain }}" mailDomain: "{{ .Values.global.domain }}"
password: {{ .Values.secrets.dovecot.doveadm }} password: {{ .Values.secrets.dovecot.doveadm | quote }}
ldap: ldap:
dn: "uid=ldapsearch_dovecot,cn=users,dc=swp-ldap,dc=internal" dn: "uid=ldapsearch_dovecot,cn=users,dc=swp-ldap,dc=internal"
password: {{ .Values.secrets.univentionCorporateServer.ldapSearch.dovecot }} password: {{ .Values.secrets.univentionCorporateServer.ldapSearch.dovecot | quote }}
oidc: oidc:
introspectionURL: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap/protocol/openid-connect/token/introspect" introspectionURL: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap/protocol/openid-connect/token/introspect"
clientSecret: {{ .Values.secrets.keycloak.clientSecret.as8oidc }} clientSecret: {{ .Values.secrets.keycloak.clientSecret.as8oidc }}

View File

@@ -11,8 +11,8 @@ global:
database: "{{ .Values.databases.oxAppsuite.name }}" database: "{{ .Values.databases.oxAppsuite.name }}"
auth: auth:
user: "{{ .Values.databases.oxAppsuite.username }}" user: "{{ .Values.databases.oxAppsuite.username }}"
password: "{{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword }}" password: {{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword | quote }}
rootPassword: "{{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword }}" rootPassword: {{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword | quote }}
istio: istio:
enabled: {{ .Values.istio.enabled }} enabled: {{ .Values.istio.enabled }}

View File

@@ -24,7 +24,7 @@ memcached:
postgresql: postgresql:
auth: auth:
password: {{ .Values.databases.openproject.password | default .Values.secrets.postgresql.openprojectUser }} password: {{ .Values.databases.openproject.password | default .Values.secrets.postgresql.openprojectUser | quote }}
username: "{{ .Values.databases.openproject.username }}" username: "{{ .Values.databases.openproject.username }}"
database: "{{ .Values.databases.openproject.name }}" database: "{{ .Values.databases.openproject.name }}"
connection: connection:
@@ -38,7 +38,7 @@ openproject:
name: "OpenProject Interal Admin" name: "OpenProject Interal Admin"
mail: "openproject-admin@swp-domain.internal" mail: "openproject-admin@swp-domain.internal"
password_reset: "false" password_reset: "false"
password: "{{ .Values.secrets.openproject.adminPassword }}" password: {{ .Values.secrets.openproject.adminPassword | quote }}
ingress: ingress:
host: "{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}" host: "{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}"

View File

@@ -21,7 +21,7 @@ oxConnector:
domainName: "{{ .Values.global.domain }}" domainName: "{{ .Values.global.domain }}"
#oxMasterAdmin: "(( .Values.appsuite.core-mw.masterAdmin ))" #oxMasterAdmin: "(( .Values.appsuite.core-mw.masterAdmin ))"
oxMasterAdmin: "admin" oxMasterAdmin: "admin"
oxMasterPassword: "{{ .Values.secrets.oxAppsuite.adminPassword }}" oxMasterPassword: {{ .Values.secrets.oxAppsuite.adminPassword | quote }}
oxSoapServer: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}" oxSoapServer: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
oxDefaultContext: "1" oxDefaultContext: "1"

View File

@@ -18,11 +18,11 @@ image:
job: job:
users: users:
- username: "xwiki_user" - username: "xwiki_user"
password: "{{ .Values.secrets.mariadb.xwikiUser }}" password: {{ .Values.secrets.mariadb.xwikiUser | quote }}
- username: "openxchange_user" - username: "openxchange_user"
password: "{{ .Values.secrets.mariadb.openxchangeUser }}" password: {{ .Values.secrets.mariadb.openxchangeUser | quote }}
- username: "nextcloud_user" - username: "nextcloud_user"
password: "{{ .Values.secrets.mariadb.nextcloudUser }}" password: {{ .Values.secrets.mariadb.nextcloudUser | quote}}
databases: databases:
- name: "xwiki" - name: "xwiki"
user: "xwiki_user" user: "xwiki_user"
@@ -32,7 +32,7 @@ job:
user: "openxchange_user" user: "openxchange_user"
mariadb: mariadb:
rootPassword: "{{ .Values.secrets.mariadb.rootPassword }}" rootPassword: {{ .Values.secrets.mariadb.rootPassword | quote }}
persistence: persistence:
storageClass: "{{ .Values.persistence.storageClassNames.RWO }}" storageClass: "{{ .Values.persistence.storageClassNames.RWO }}"

View File

@@ -16,15 +16,15 @@ image:
job: job:
users: users:
- username: "keycloak_user" - username: "keycloak_user"
password: {{ .Values.secrets.postgresql.keycloakUser }} password: {{ .Values.secrets.postgresql.keycloakUser | quote }}
- username: "openproject_user" - username: "openproject_user"
password: {{ .Values.secrets.postgresql.openprojectUser }} password: {{ .Values.secrets.postgresql.openprojectUser | quote }}
- username: "keycloak_extensions_user" - username: "keycloak_extensions_user"
password: {{ .Values.secrets.postgresql.keycloakExtensionUser }} password: {{ .Values.secrets.postgresql.keycloakExtensionUser | quote }}
- username: "matrix_user" - username: "matrix_user"
password: {{ .Values.secrets.postgresql.matrixUser }} password: {{ .Values.secrets.postgresql.matrixUser | quote }}
- username: "notificationsapi_user" - username: "notificationsapi_user"
password: {{ .Values.secrets.postgresql.notificationsapiUser }} password: {{ .Values.secrets.postgresql.notificationsapiUser | quote }}
databases: databases:
- name: "keycloak" - name: "keycloak"
user: "keycloak_user" user: "keycloak_user"
@@ -43,7 +43,7 @@ persistence:
size: "{{ .Values.persistence.size.postgresql }}" size: "{{ .Values.persistence.size.postgresql }}"
postgres: postgres:
password: {{ .Values.secrets.postgresql.postgresUser }} password: {{ .Values.secrets.postgresql.postgresUser | quote }}
resources: resources:
{{ .Values.resources.postgresql | toYaml | nindent 2 }} {{ .Values.resources.postgresql | toYaml | nindent 2 }}

View File

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
*/}} */}}
--- ---
auth: auth:
password: {{ .Values.secrets.redis.password }} password: {{ .Values.secrets.redis.password | quote }}
global: global:
imageRegistry: "{{ .Values.global.imageRegistry }}" imageRegistry: "{{ .Values.global.imageRegistry }}"

View File

@@ -37,31 +37,31 @@ extraEnvVars:
- name: LDAPSEARCH_OX_USERNAME - name: LDAPSEARCH_OX_USERNAME
value: "ldapsearch_ox" value: "ldapsearch_ox"
- name: LDAPSEARCH_OX_PASSWORD - name: LDAPSEARCH_OX_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.ox }} value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.ox | quote }}
- name: LDAPSEARCH_DOVECOT_USERNAME - name: LDAPSEARCH_DOVECOT_USERNAME
value: "ldapsearch_dovecot" value: "ldapsearch_dovecot"
- name: LDAPSEARCH_DOVECOT_PASSWORD - name: LDAPSEARCH_DOVECOT_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.dovecot }} value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.dovecot | quote }}
- name: LDAPSEARCH_KEYCLOAK_USERNAME - name: LDAPSEARCH_KEYCLOAK_USERNAME
value: "ldapsearch_keycloak" value: "ldapsearch_keycloak"
- name: LDAPSEARCH_KEYCLOAK_PASSWORD - name: LDAPSEARCH_KEYCLOAK_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.keycloak }} value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.keycloak | quote }}
- name: LDAPSEARCH_NEXTCLOUD_USERNAME - name: LDAPSEARCH_NEXTCLOUD_USERNAME
value: "ldapsearch_nextcloud" value: "ldapsearch_nextcloud"
- name: LDAPSEARCH_NEXTCLOUD_PASSWORD - name: LDAPSEARCH_NEXTCLOUD_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud }} value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud | quote }}
- name: LDAPSEARCH_OPENPROJECT_USERNAME - name: LDAPSEARCH_OPENPROJECT_USERNAME
value: "ldapsearch_openproject" value: "ldapsearch_openproject"
- name: LDAPSEARCH_OPENPROJECT_PASSWORD - name: LDAPSEARCH_OPENPROJECT_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.openproject }} value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.openproject | quote }}
- name: LDAPSEARCH_XWIKI_USERNAME - name: LDAPSEARCH_XWIKI_USERNAME
value: "ldapsearch_xwiki" value: "ldapsearch_xwiki"
- name: LDAPSEARCH_XWIKI_PASSWORD - name: LDAPSEARCH_XWIKI_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.xwiki }} value: {{ .Values.secrets.univentionCorporateServer.ldapSearch.xwiki | quote }}
- name: DEFAULT_ACCOUNT_USER_PASSWORD - name: DEFAULT_ACCOUNT_USER_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.defaultAccounts.userPassword }} value: {{ .Values.secrets.univentionCorporateServer.defaultAccounts.userPassword | quote }}
- name: DEFAULT_ACCOUNT_ADMIN_PASSWORD - name: DEFAULT_ACCOUNT_ADMIN_PASSWORD
value: {{ .Values.secrets.univentionCorporateServer.defaultAccounts.adminPassword }} value: {{ .Values.secrets.univentionCorporateServer.defaultAccounts.adminPassword | quote }}
resources: resources:
{{ .Values.resources.univentionCorporateServer | toYaml | nindent 2 }} {{ .Values.resources.univentionCorporateServer | toYaml | nindent 2 }}

View File

@@ -11,7 +11,7 @@ postgresql:
auth: auth:
username: "notificationsapi_user" username: "notificationsapi_user"
database: "notificationsapi" database: "notificationsapi"
password: {{ .Values.secrets.postgresql.notificationsapiUser }} password: {{ .Values.secrets.postgresql.notificationsapiUser | quote }}
image: image:
registry: "{{ .Values.global.imageRegistry }}" registry: "{{ .Values.global.imageRegistry }}"

View File

@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
--- ---
stackDataSwp: stackDataSwp:
udmApiUsername: "cn=admin" udmApiUsername: "cn=admin"
udmApiPassword: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}" udmApiPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"
loadDevData: true loadDevData: true

View File

@@ -5,13 +5,13 @@ SPDX-License-Identifier: Apache-2.0
--- ---
stackDataUms: stackDataUms:
udmApiUser: "cn=admin" udmApiUser: "cn=admin"
udmApiPassword: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}" udmApiPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"
loadDevData: true loadDevData: true
stackDataContext: stackDataContext:
ldapBase: "dc=swp-ldap,dc=internal" ldapBase: "dc=swp-ldap,dc=internal"
initialPasswordAdministrator: "{{ .Values.secrets.univentionManagementStack.defaultAccounts.administratorPassword }}" initialPasswordAdministrator: {{ .Values.secrets.univentionManagementStack.defaultAccounts.administratorPassword | quote }}
# The SWP configuration brings its own UMC policies. # The SWP configuration brings its own UMC policies.
installUmcPolicies: false installUmcPolicies: false

View File

@@ -9,7 +9,7 @@ image:
pullPolicy: "{{ .Values.global.imagePullPolicy }}" pullPolicy: "{{ .Values.global.imagePullPolicy }}"
externalDB: externalDB:
password: "{{ .Values.databases.xwiki.password | default .Values.secrets.mariadb.rootPassword }}" password: {{ .Values.databases.xwiki.password | default .Values.secrets.mariadb.rootPassword | quote }}
database: "{{ .Values.databases.xwiki.name }}" database: "{{ .Values.databases.xwiki.name }}"
user: "{{ .Values.databases.xwiki.username }}" user: "{{ .Values.databases.xwiki.username }}"
host: "{{ .Values.databases.xwiki.host }}" host: "{{ .Values.databases.xwiki.host }}"