From fa985e8402bf4358fff7026e08064183933f1f14 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 25 Apr 2022 16:26:58 +0300
Subject: [PATCH] fix(mongodb): fix (#2563)

* fix(mongodb): fix

* no adv host

* again

* again

* again

* lets see

* update probe
---
 charts/dependency/mongodb/Chart.yaml  |  2 +-
 charts/dependency/mongodb/values.yaml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/charts/dependency/mongodb/Chart.yaml b/charts/dependency/mongodb/Chart.yaml
index 7c563e26247..2ca9aafb746 100644
--- a/charts/dependency/mongodb/Chart.yaml
+++ b/charts/dependency/mongodb/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-mongodb
   - https://www.mongodb.com
 type: application
-version: 0.1.6
+version: 0.1.7
 annotations:
   truecharts.org/catagories: |
     - database
diff --git a/charts/dependency/mongodb/values.yaml b/charts/dependency/mongodb/values.yaml
index cb5b0fbaa62..b4ba65037f6 100644
--- a/charts/dependency/mongodb/values.yaml
+++ b/charts/dependency/mongodb/values.yaml
@@ -62,7 +62,7 @@ probes:
         command:
           - /bin/bash
           - -ec
-          - echo "rs.status().ok" | mongo --host "${MONGODB_ADVERTISED_HOSTNAME}" -u root -p ${MONGODB_ROOT_PASSWORD} --port 27017 --quiet
+          - echo "rs.status().ok" | mongo --host "${MONGODB_ADVERTISED_HOSTNAME}" -u root -p ${MONGODB_ROOT_PASSWORD} --port "${MONGODB_ADVERTISED_PORT_NUMBER}" --quiet
 
   # -- Redainess probe configuration
   # @default -- See below
@@ -79,7 +79,7 @@ probes:
         command:
           - /bin/bash
           - -ec
-          - echo "rs.status().ok" | mongo --host "${MONGODB_ADVERTISED_HOSTNAME}" -u root -p ${MONGODB_ROOT_PASSWORD} --port 27017 --quiet
+          - echo "rs.status().ok" | mongo --host "${MONGODB_ADVERTISED_HOSTNAME}" -u root -p ${MONGODB_ROOT_PASSWORD} --port "${MONGODB_ADVERTISED_PORT_NUMBER}" --quiet
 
   # -- Startup probe configuration
   # @default -- See below
@@ -95,7 +95,7 @@ probes:
         command:
           - /bin/bash
           - -ec
-          - echo "rs.status().ok" | mongo --host "${MONGODB_ADVERTISED_HOSTNAME}" -u root -p ${MONGODB_ROOT_PASSWORD} --port 27017 --quiet
+          - echo "rs.status().ok" | mongo --host "${MONGODB_ADVERTISED_HOSTNAME}" -u root -p ${MONGODB_ROOT_PASSWORD} --port "${MONGODB_ADVERTISED_PORT_NUMBER}" --quiet
 
 mongodbPassword: "testpass"
 mongodbUsername: "test"
@@ -104,6 +104,7 @@ mongodbRootPassword: "testroot"
 mongodbReplicasetMode: "primary"
 mongodbReplicasetName: "rs0"
 mongodbReplicasetKey: "testreplicasetkey"
+mongodbDependency: false
 existingSecret: ""
 
 envValueFrom:
@@ -125,8 +126,8 @@ env:
   MONGODB_DATABASE: "{{ .Values.mongodbDatabase }}"
   MONGODB_REPLICA_SET_MODE: "{{ .Values.mongodbReplicasetMode }}"
   MONGODB_REPLICA_SET_NAME: "{{ .Values.mongodbReplicasetName }}"
-  MONGODB_ADVERTISED_HOSTNAME: "{{ .Release.Name }}"
+  MONGODB_ADVERTISED_HOSTNAME: "{{ if .Values.mongodbDependency }}{{ .Release.Name }}-mongodb-0{{ else }}{{ .Release.Name }}-0{{ end }}"
   MONGODB_ADVERTISED_PORT_NUMBER: 27017
-  MONGODB_INITIAL_PRIMARY_HOST: "{{ .Release.Name }}"
+  MONGODB_INITIAL_PRIMARY_HOST: "{{ if .Values.mongodbDependency }}{{ .Release.Name }}-mongodb-0{{ else }}{{ .Release.Name }}-0{{ end }}"
   MONGODB_INITIAL_PRIMARY_PORT_NUMBER: 27017
   MONGODB_ENABLE_JOURNAL: true