Skip to content

Commit 7dc9d76

Browse files
committed
Update _helpers.tpl
Returned default values for the external database Signed-off-by: Bastik <52692712+bastikus@users.noreply.github.com>
1 parent 5bde14f commit 7dc9d76

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

charts/nextcloud/templates/_helpers.tpl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ Create environment variables used to configure the nextcloud container as well a
8181
valueFrom:
8282
secretKeyRef:
8383
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
84-
key: {{ .Values.externalDatabase.existingSecret.usernameKey }}
84+
key: {{ .Values.externalDatabase.existingSecret.usernameKey | default "db-username" }}
8585
- name: MYSQL_PASSWORD
8686
valueFrom:
8787
secretKeyRef:
8888
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
89-
key: {{ .Values.externalDatabase.existingSecret.passwordKey }}
89+
key: {{ .Values.externalDatabase.existingSecret.passwordKey | default "db-password" }}
9090
{{- else if .Values.postgresql.enabled }}
9191
- name: POSTGRES_HOST
9292
value: {{ template "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
@@ -100,12 +100,12 @@ Create environment variables used to configure the nextcloud container as well a
100100
valueFrom:
101101
secretKeyRef:
102102
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
103-
key: {{ .Values.externalDatabase.existingSecret.usernameKey }}
103+
key: {{ .Values.externalDatabase.existingSecret.usernameKey | default "db-username" }}
104104
- name: POSTGRES_PASSWORD
105105
valueFrom:
106106
secretKeyRef:
107107
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
108-
key: {{ .Values.externalDatabase.existingSecret.passwordKey }}
108+
key: {{ .Values.externalDatabase.existingSecret.passwordKey | default "db-password" }}
109109
{{- else }}
110110
{{- if eq .Values.externalDatabase.type "postgresql" }}
111111
- name: POSTGRES_HOST
@@ -130,12 +130,12 @@ Create environment variables used to configure the nextcloud container as well a
130130
valueFrom:
131131
secretKeyRef:
132132
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
133-
key: {{ .Values.externalDatabase.existingSecret.usernameKey }}
133+
key: {{ .Values.externalDatabase.existingSecret.usernameKey | default "db-username" }}
134134
- name: POSTGRES_PASSWORD
135135
valueFrom:
136136
secretKeyRef:
137137
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
138-
key: {{ .Values.externalDatabase.existingSecret.passwordKey }}
138+
key: {{ .Values.externalDatabase.existingSecret.passwordKey | default "db-password" }}
139139
{{- else }}
140140
- name: MYSQL_HOST
141141
{{- if .Values.externalDatabase.existingSecret.hostKey }}
@@ -159,24 +159,24 @@ Create environment variables used to configure the nextcloud container as well a
159159
valueFrom:
160160
secretKeyRef:
161161
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
162-
key: {{ .Values.externalDatabase.existingSecret.usernameKey }}
162+
key: {{ .Values.externalDatabase.existingSecret.usernameKey | default "db-username" }}
163163
- name: MYSQL_PASSWORD
164164
valueFrom:
165165
secretKeyRef:
166166
name: {{ .Values.externalDatabase.existingSecret.secretName | default (printf "%s-db" .Release.Name) }}
167-
key: {{ .Values.externalDatabase.existingSecret.passwordKey }}
167+
key: {{ .Values.externalDatabase.existingSecret.passwordKey | default "db-password" }}
168168
{{- end }}
169169
{{- end }}
170170
- name: NEXTCLOUD_ADMIN_USER
171171
valueFrom:
172172
secretKeyRef:
173173
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
174-
key: {{ .Values.nextcloud.existingSecret.usernameKey }}
174+
key: {{ .Values.nextcloud.existingSecret.usernameKey | default "nextcloud-username" }}
175175
- name: NEXTCLOUD_ADMIN_PASSWORD
176176
valueFrom:
177177
secretKeyRef:
178178
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
179-
key: {{ .Values.nextcloud.existingSecret.passwordKey }}
179+
key: {{ .Values.nextcloud.existingSecret.passwordKey | default "nextcloud-password" }}
180180
- name: NEXTCLOUD_TRUSTED_DOMAINS
181181
value: {{ .Values.nextcloud.host }}
182182
{{- if ne (int .Values.nextcloud.update) 0 }}
@@ -205,12 +205,12 @@ Create environment variables used to configure the nextcloud container as well a
205205
valueFrom:
206206
secretKeyRef:
207207
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
208-
key: {{ .Values.nextcloud.existingSecret.smtpUsernameKey }}
208+
key: {{ .Values.nextcloud.existingSecret.smtpUsernameKey | default "smtp-username" }}
209209
- name: SMTP_PASSWORD
210210
valueFrom:
211211
secretKeyRef:
212212
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
213-
key: {{ .Values.nextcloud.existingSecret.smtpPasswordKey }}
213+
key: {{ .Values.nextcloud.existingSecret.smtpPasswordKey | default "smtp-password" }}
214214
{{- end }}
215215
{{- if .Values.redis.enabled }}
216216
- name: REDIS_HOST

0 commit comments

Comments
 (0)