UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit c204cf8d authored by Andrew Kesterson's avatar Andrew Kesterson
Browse files

Mattermost #155: Force mattermost chart template to properly manage postgresql values

### Changed
- Mattermost: Add explicit reference to username and password in mattermost secret for bigbang override
- Mattermost: Change mattermost subchart postgresql config to reference our custom secret instead of using its own
- Mattermost: Force the usage of mattermost-dbcreds when no specific secret is specified
parent a1004a1b
No related branches found
No related tags found
2 merge requests!4912SKIP UPGRADE CHECK mattermost update to 9.10.1-bb.2,!4904feat: Add Kiali labels for Mattermost/MattermostOperator
......@@ -14,6 +14,8 @@ metadata:
stringData:
DB_CONNECTION_CHECK_URL: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode | default "disable" }}"
DB_CONNECTION_STRING: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode | default "disable" }}"
username: "{{ .username }}"
password: "{{ .password }}"
{{- end }}
{{- end }}
{{- end }}
\ No newline at end of file
......@@ -88,11 +88,18 @@ enterprise:
{{- if and .username .password .host .port .database }}
database:
secret: "mattermost-database-secret"
postgresql:
secret: "mattermost-database-secret"
{{- else }}
postgresql:
image:
pullSecrets:
- private-registry
{{- if and .username .password .host .port .database }}
secret: "mattermost-database-secret"
{{- else }}
secret: "mattermost-dbcreds"
{{- end }}
install: true
{{- if $istioInjection }}
primary:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment