From 41ebdaeeed7000b06f73075484b862ff8db06961 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 6 Mar 2023 17:30:57 +0100
Subject: [PATCH] append .url

---
 .../common/templates/lib/dependencies/_clickhouseInjector.tpl | 2 +-
 .../common/templates/lib/dependencies/_mariadbInjector.tpl    | 4 ++--
 .../common/templates/lib/dependencies/_mongodbInjector.tpl    | 4 ++--
 library/common/templates/lib/dependencies/_redisInjector.tpl  | 2 +-
 library/common/templates/lib/dependencies/_solrInjector.tpl   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/common/templates/lib/dependencies/_clickhouseInjector.tpl b/library/common/templates/lib/dependencies/_clickhouseInjector.tpl
index 7756e5e8..308000bf 100644
--- a/library/common/templates/lib/dependencies/_clickhouseInjector.tpl
+++ b/library/common/templates/lib/dependencies/_clickhouseInjector.tpl
@@ -35,7 +35,7 @@ data:
   url:                 {{ $url }}
   jdbc:                {{ $jdbc }}
 
-{{- $_ := set .Values.clickhouse     "clickhousePassword" ($dbPass | quote) }}
+{{- $_ := set .Values.clickhouse.url "clickhousePassword" ($dbPass | quote) }}
 {{- $_ := set .Values.clickhouse.url "plain"              ($host | quote) }}
 {{- $_ := set .Values.clickhouse.url "plainhost"          ($host | quote) }}
 {{- $_ := set .Values.clickhouse.url "plainport"          ($portHost | quote) }}
diff --git a/library/common/templates/lib/dependencies/_mariadbInjector.tpl b/library/common/templates/lib/dependencies/_mariadbInjector.tpl
index bf220e0a..bef402a7 100644
--- a/library/common/templates/lib/dependencies/_mariadbInjector.tpl
+++ b/library/common/templates/lib/dependencies/_mariadbInjector.tpl
@@ -38,8 +38,8 @@ data:
   jdbc-mysql: {{ ( printf "jdbc:mysql://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase  ) }}
   jdbc-mariadb: {{ ( printf "jdbc:mariadb://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase  ) }}
 type: Opaque
-{{- $_ := set .Values.mariadb "mariadbPassword" ( $dbPass | quote ) }}
-{{- $_ := set .Values.mariadb "mariadbRootPassword" ( $rootPass | quote ) }}
+{{- $_ := set .Values.mariadb.url "mariadbPassword" ( $dbPass | quote ) }}
+{{- $_ := set .Values.mariadb.url "mariadbRootPassword" ( $rootPass | quote ) }}
 {{- $_ := set .Values.mariadb.url "plain" ( ( printf "%v-%v" .Release.Name "mariadb" ) | quote ) }}
 {{- $_ := set .Values.mariadb.url "plainhost" ( ( printf "%v-%v" .Release.Name "mariadb" ) | quote ) }}
 {{- $_ := set .Values.mariadb.url "plainport" ( ( printf "%v-%v:3306" .Release.Name "mariadb" ) | quote ) }}
diff --git a/library/common/templates/lib/dependencies/_mongodbInjector.tpl b/library/common/templates/lib/dependencies/_mongodbInjector.tpl
index a148ad04..f40748b3 100644
--- a/library/common/templates/lib/dependencies/_mongodbInjector.tpl
+++ b/library/common/templates/lib/dependencies/_mongodbInjector.tpl
@@ -37,8 +37,8 @@ data:
   plainhost: {{ ( printf "%v-%v" .Release.Name "mongodb" ) }}
   plainporthost: {{ ( printf "%v-%v:27017" .Release.Name "mongodb" ) }}
 type: Opaque
-{{- $_ := set .Values.mongodb "mongodbPassword" ( $dbPass | quote ) }}
-{{- $_ := set .Values.mongodb "mongodbRootPassword" ( $rootPass | quote ) }}
+{{- $_ := set .Values.mongodb.url "mongodbPassword" ( $dbPass | quote ) }}
+{{- $_ := set .Values.mongodb.url "mongodbRootPassword" ( $rootPass | quote ) }}
 {{- $_ := set .Values.mongodb.url "plain" ( ( printf "%v-%v" .Release.Name "mongodb" ) | quote ) }}
 {{- $_ := set .Values.mongodb.url "plainhost" ( ( printf "%v-%v" .Release.Name "mongodb" ) | quote ) }}
 {{- $_ := set .Values.mongodb.url "plainport" ( ( printf "%v-%v:27017" .Release.Name "mongodb" ) | quote ) }}
diff --git a/library/common/templates/lib/dependencies/_redisInjector.tpl b/library/common/templates/lib/dependencies/_redisInjector.tpl
index 44c1ee12..47f9e234 100644
--- a/library/common/templates/lib/dependencies/_redisInjector.tpl
+++ b/library/common/templates/lib/dependencies/_redisInjector.tpl
@@ -31,7 +31,7 @@ data:
   plainporthost: {{ ( printf "%v-%v:6379" .Release.Name "redis" ) }}
   plainhost: {{ ( printf "%v-%v" .Release.Name "redis" ) }}
 type: Opaque
-{{- $_ := set .Values.redis "redisPassword" ( $dbPass | quote ) }}
+{{- $_ := set .Values.redis.url "redisPassword" ( $dbPass | quote ) }}
 {{- $_ := set .Values.redis.url "plain" ( ( printf "%v-%v" .Release.Name "redis" ) | quote ) }}
 {{- $_ := set .Values.redis.url "plainhost" ( ( printf "%v-%v" .Release.Name "redis" ) | quote ) }}
 {{- $_ := set .Values.redis.url "plainport" ( ( printf "%v-%v:6379" .Release.Name "redis" ) | quote ) }}
diff --git a/library/common/templates/lib/dependencies/_solrInjector.tpl b/library/common/templates/lib/dependencies/_solrInjector.tpl
index c26f6ef1..7b7111b7 100644
--- a/library/common/templates/lib/dependencies/_solrInjector.tpl
+++ b/library/common/templates/lib/dependencies/_solrInjector.tpl
@@ -26,7 +26,7 @@ data:
   url: {{ ( printf "http://%v:%v@%v-solr:8983/url/%v" .Values.solr.solrUsername $solrPass .Release.Name .Values.solr.solrCores ) }}
   plainhost: {{ ( ( printf "%v-%v" .Release.Name "solr" ) ) }}
 type: Opaque
-{{- $_ := set .Values.solr "solrPassword" ( $solrPass | quote ) }}
+{{- $_ := set .Values.solr.url "solrPassword" ( $solrPass | quote ) }}
 {{- $_ := set .Values.solr.url "plain" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }}
 {{- $_ := set .Values.solr.url "plainhost" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }}