From 738f62db5ab652f27df823b1eb773c636e2c9dbf Mon Sep 17 00:00:00 2001 From: "Gupta, Sangeet (sg774j)" Date: Wed, 29 Jul 2020 19:17:35 +0000 Subject: [PATCH] mariadb: fix new line issue Change-Id: Ibd45968900d06f7a3059aa184ed272fa99ad36d5 --- .../monitoring/prometheus/secrets/_exporter_user.cnf.tpl | 4 ++-- mariadb/templates/secrets/_admin_user.cnf.tpl | 4 ++-- mariadb/templates/secrets/_admin_user_internal.cnf.tpl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl b/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl index 111d492fe..cd31a6671 100644 --- a/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl +++ b/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl @@ -17,9 +17,9 @@ user = {{ .Values.endpoints.oslo_db.auth.exporter.username }} password = {{ .Values.endpoints.oslo_db.auth.exporter.password }} host = {{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} port = {{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} -{{- if .Values.manifests.certificates -}} +{{- if .Values.manifests.certificates }} ssl-ca = /etc/mysql/certs/ca.crt ssl-key = /etc/mysql/certs/tls.key ssl-cert = /etc/mysql/certs/tls.crt -{{- end -}} +{{- end }} diff --git a/mariadb/templates/secrets/_admin_user.cnf.tpl b/mariadb/templates/secrets/_admin_user.cnf.tpl index 2148731dc..0031a4bd7 100644 --- a/mariadb/templates/secrets/_admin_user.cnf.tpl +++ b/mariadb/templates/secrets/_admin_user.cnf.tpl @@ -17,8 +17,8 @@ user = {{ .Values.endpoints.oslo_db.auth.admin.username }} password = {{ .Values.endpoints.oslo_db.auth.admin.password }} host = {{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} port = {{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} -{{- if .Values.manifests.certificates -}} +{{- if .Values.manifests.certificates }} ssl-ca = /etc/mysql/certs/ca.crt ssl-key = /etc/mysql/certs/tls.key ssl-cert = /etc/mysql/certs/tls.crt -{{- end -}} +{{- end }} diff --git a/mariadb/templates/secrets/_admin_user_internal.cnf.tpl b/mariadb/templates/secrets/_admin_user_internal.cnf.tpl index 72125c417..fa0d09a55 100644 --- a/mariadb/templates/secrets/_admin_user_internal.cnf.tpl +++ b/mariadb/templates/secrets/_admin_user_internal.cnf.tpl @@ -17,8 +17,8 @@ user = {{ .Values.endpoints.oslo_db.auth.admin.username }} password = {{ .Values.endpoints.oslo_db.auth.admin.password }} host = {{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} port = {{ tuple "oslo_db" "internal" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} -{{- if .Values.manifests.certificates -}} +{{- if .Values.manifests.certificates }} ssl-ca = /etc/mysql/certs/ca.crt ssl-key = /etc/mysql/certs/tls.key ssl-cert = /etc/mysql/certs/tls.crt -{{- end -}} +{{- end }}