UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit d410e29b authored by Josh Wolf's avatar Josh Wolf Committed by kevin.wilder
Browse files

fix: use global context for mattermost commonLabels

parent f0e6f8d7
No related branches found
No related tags found
1 merge request!295Resolve "release-1.2.0"
...@@ -37,7 +37,7 @@ metadata: ...@@ -37,7 +37,7 @@ metadata:
labels: labels:
app.kubernetes.io/name: mattermost app.kubernetes.io/name: mattermost
app.kubernetes.io/component: "collaboration-tools" app.kubernetes.io/component: "collaboration-tools"
{{- include "commonLabels" . | nindent 4}} {{- include "commonLabels" $ | nindent 4}}
stringData: stringData:
DB_CONNECTION_CHECK_URL: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode }}" DB_CONNECTION_CHECK_URL: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode }}"
DB_CONNECTION_STRING: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode }}" DB_CONNECTION_STRING: "postgres://{{ .username }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .database }}?connect_timeout=10&sslmode={{ .ssl_mode }}"
...@@ -56,10 +56,10 @@ metadata: ...@@ -56,10 +56,10 @@ metadata:
labels: labels:
app.kubernetes.io/name: mattermost app.kubernetes.io/name: mattermost
app.kubernetes.io/component: "collaboration-tools" app.kubernetes.io/component: "collaboration-tools"
{{- include "commonLabels" . | nindent 4}} {{- include "commonLabels" $ | nindent 4}}
data: data:
accesskey: {{ .accessKey | b64enc }} accesskey: {{ .accessKey | b64enc }}
secretkey: {{ .secretKey | b64enc }} secretkey: {{ .accessSecret | b64enc }}
{{- end }} {{- end }}
{{- end }} {{- end }}
......
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