fix helpers.tpl breaks due to mongodb not enabled

Signed-off-by: bingwei-hong-partior <[email protected]>
litmuschaos · Nov 25, 2022 · 4963e14 · 4963e14
1 parent 8be082a
commit 4963e14
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.14.0"
 description: A Helm chart to install ChaosCenter
 name: litmus
-version: 2.15.1
+version: 2.15.2
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

diff --git a/charts/litmus/README.md b/charts/litmus/README.md
@@ -1,6 +1,6 @@
 # litmus
 
-![Version: 2.15.1](https://img.shields.io/badge/Version-2.15.1-informational?style=flat-square) ![AppVersion: 2.14.0](https://img.shields.io/badge/AppVersion-2.14.0-informational?style=flat-square)
+![Version: 2.15.2](https://img.shields.io/badge/Version-2.15.2-informational?style=flat-square) ![AppVersion: 2.14.0](https://img.shields.io/badge/AppVersion-2.14.0-informational?style=flat-square)
 
 A Helm chart to install ChaosCenter
 

diff --git a/charts/litmus/templates/_helpers.tpl b/charts/litmus/templates/_helpers.tpl
@@ -79,9 +79,13 @@ Check for existing secret
 {{- end -}}
 
 {{- define "litmus-portal.mongodbServiceName" -}}
-    {{- if not (eq .Values.mongodb.architecture "replicaset") }}
-        {{- include "mongodb.fullname" .Subcharts.mongodb -}}
+    {{- if not .Values.mongodb.enabled }}
+        {{- .Values.adminConfig.DB_SERVER -}}
     {{ else }}
-        {{- include "mongodb.service.nameOverride" .Subcharts.mongodb -}}
+        {{- if not (eq .Values.mongodb.architecture "replicaset") }}
+            {{- include "mongodb.fullname" .Subcharts.mongodb -}}
+        {{ else }}
+            {{- include "mongodb.service.nameOverride" .Subcharts.mongodb -}}
+        {{- end -}}
     {{- end -}}
 {{- end -}}