From 899ac793510363cc9d646773811d623725d93358 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sun, 24 Apr 2022 12:57:45 +0300
Subject: [PATCH] feat(mongodb): add replicaset urls (#42)

* feat(mongodb): add replicaset urls

* formatting

* update urls
---
 charts/common/Chart.yaml                            |  2 +-
 .../templates/lib/dependencies/_mongodbInjector.tpl | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index ff98b1047..438b73134 100644
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 9.2.9
+version: 9.3.0
diff --git a/charts/common/templates/lib/dependencies/_mongodbInjector.tpl b/charts/common/templates/lib/dependencies/_mongodbInjector.tpl
index 021feacc2..f3f595c0d 100644
--- a/charts/common/templates/lib/dependencies/_mongodbInjector.tpl
+++ b/charts/common/templates/lib/dependencies/_mongodbInjector.tpl
@@ -27,12 +27,13 @@ data:
   mongodb-password: {{ $dbPass | b64enc | quote }}
   mongodb-root-password: {{ $rootPass | b64enc | quote }}
 {{- end }}
-  url: {{ ( printf "mongodb://%v:%v@%v-mongodb:27017/%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase  ) | b64enc | quote }}
-  urlssl: {{ ( printf "mongodb://%v:%v@%v-mongodb:27017/%v?ssl=true" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase  ) | b64enc | quote }}
-  urltls: {{ ( printf "mongodb://%v:%v@%v-mongodb:27017/%v?tls=true" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase  ) | b64enc | quote }}
+  url: {{ ( printf "mongodb://%v:%v@%v-mongodb:27017/%v?authSource=%v&replicaSet=%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | b64enc | quote }}
+  urlssl: {{ ( printf "mongodb://%v:%v@%v-mongodb:27017/%v?authSource=%v&replicaSet=%v&ssl=true" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | b64enc | quote }}
+  urltls: {{ ( printf "mongodb://%v:%v@%v-mongodb:27017/%v?authSource=%v&replicaSet=%v&tls=true" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | b64enc | quote }}
+  urloplog: {{ ( printf "mongodb://%v-oplog:%v@%v-mongodb:27017/local?authSource=%v&replicaSet=%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | b64enc | quote }}
+  jdbc: {{ ( printf "jdbc:mongodb://%v-mongodb:27017/%v?authSource=%v&replicaSet=%v" .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | b64enc | quote }}
   plainhost: {{ ( printf "%v-%v" .Release.Name "mongodb" ) | b64enc | quote }}
   plainporthost: {{ ( printf "%v-%v:27017" .Release.Name "mongodb" ) | b64enc | quote }}
-  jdbc: {{ ( printf "jdbc:mongodb://%v-mongodb:27017/%v" .Release.Name .Values.mongodb.mongodbDatabase  ) | b64enc | quote }}
 type: Opaque
 {{- $_ := set .Values.mongodb "mongodbPassword" ( $dbPass | quote ) }}
 {{- $_ := set .Values.mongodb "mongodbRootPassword" ( $rootPass | quote ) }}
@@ -40,8 +41,8 @@ type: Opaque
 {{- $_ := 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 ) }}
 {{- $_ := set .Values.mongodb.url "plainporthost" ( ( printf "%v-%v:27017" .Release.Name "mongodb" ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "complete" ( ( printf "mongodb://%v:%v@%v-mongodb:27017/%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase  ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "jdbc" ( ( printf "jdbc:mongodb://%v-mongodb:27017/%v" .Release.Name .Values.mongodb.mongodbDatabase  ) | quote ) }}
+{{- $_ := set .Values.mongodb.url "complete" ( ( printf "mongodb://%v:%v@%v-mongodb:27017/%v?authSource=%v&replicaSet=%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | quote ) }}
+{{- $_ := set .Values.mongodb.url "jdbc" ( ( printf "jdbc:mongodb://%v-mongodb:27017/%v?authSource=%v&replicaSet=%v" .Release.Name .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbDatabase .Values.mongodb.mongodbReplicasetName ) | quote ) }}
 
 {{- end }}
 {{- end -}}