From 5c39454bf5386c10256ea9a5fb69d1c537226b43 Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@parsons.com>
Date: Mon, 1 Mar 2021 14:59:44 -0700
Subject: [PATCH] chore: fix ssl mode thingy
---
.../mattermost/mattermost/mattermost-helmrelease.yaml | 2 +-
chart/templates/mattermost/mattermost/namespace.yaml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
index c94b45ade3..373b373389 100644
--- a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+++ b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
@@ -66,7 +66,7 @@ spec:
license: {{ .license }}
{{- end }}
{{- with .Values.addons.mattermost.database }}
- {{- if and .username .password .host .port .database .ssl_mode }}
+ {{- if and .username .password .host .port .database }}
database:
secret: "mattermost-database-secret"
{{- else }}
diff --git a/chart/templates/mattermost/mattermost/namespace.yaml b/chart/templates/mattermost/mattermost/namespace.yaml
index d4283a71ab..a52632cc6e 100644
--- a/chart/templates/mattermost/mattermost/namespace.yaml
+++ b/chart/templates/mattermost/mattermost/namespace.yaml
@@ -27,7 +27,7 @@ data:
---
{{- with .Values.addons.mattermost.database }}
-{{- if and .username .password .host .port .database .ssl_mode }}
+{{- if and .username .password .host .port .database }}
apiVersion: v1
kind: Secret
type: Opaque
@@ -39,8 +39,8 @@ metadata:
app.kubernetes.io/component: "collaboration-tools"
{{- include "commonLabels" $ | nindent 4}}
stringData:
- 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_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" }}"
{{- end }}
{{- end }}
--
GitLab