From 636091af655fbb71960754117b5af374d87ece4d Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 28 Nov 2021 15:08:37 +0100 Subject: [PATCH] fix(common): patch common mariadb linker --- charts/library/common/Chart.yaml | 2 +- .../common/templates/lib/dependencies/_mariadbInjector.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 538de9592c2..78e11bbfbca 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 8.9.3 +version: 8.9.4 diff --git a/charts/library/common/templates/lib/dependencies/_mariadbInjector.tpl b/charts/library/common/templates/lib/dependencies/_mariadbInjector.tpl index 1f50b2cd46c..e61c8d40d99 100644 --- a/charts/library/common/templates/lib/dependencies/_mariadbInjector.tpl +++ b/charts/library/common/templates/lib/dependencies/_mariadbInjector.tpl @@ -11,7 +11,7 @@ kind: Secret metadata: labels: {{- include "common.labels" . | nindent 4 }} - name: mariamariadbcreds + name: mariadbcreds {{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "mariadbcreds" }} {{- $dbPass := "" }} {{- $rootPass := "" }} @@ -29,7 +29,7 @@ data: {{- end }} url: {{ ( printf "sql://%v:%v@%v-mariadb:3306/%v" .Values.mariadb.mariadbUsername $dbPass .Release.Name .Values.mariadb.mariadbDatabase ) | b64enc | quote }} urlnossl: {{ ( printf "sql://%v:%v@%v-mariadb:3306/%v?sslmode=disable" .Values.mariadb.mariadbUsername $dbPass .Release.Name .Values.mariadb.mariadbDatabase ) | b64enc | quote }} - plainporthost: {{ ( printf "%v-%v" .Release.Name "mariadb" ) | b64enc | quote }} + plainporthost: {{ ( printf "%v-%v:3306" .Release.Name "mariadb" ) | b64enc | quote }} plainhost: {{ ( printf "%v-%v" .Release.Name "mariadb" ) | b64enc | quote }} jdbc: {{ ( printf "jdbc:sqlserver://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase ) | b64enc | quote }} type: Opaque