fix breaks when external mongodb is used

bingwei-hong-partior · bingwei-hong-partior · commit d19dda099412 · 2022-11-25T09:23:04.000Z
diff --git a/charts/litmus/templates/auth-server-deployment.yaml b/charts/litmus/templates/auth-server-deployment.yaml
@@ -42,7 +42,11 @@ spec:
           command: ["/bin/sh", "-c"]
           args:
             [
+              {{- if .Values.mongodb.enabled }}              
                 "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.mongodb.service.ports.mongodb }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",
+              {{- else }}
+                "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.adminConfig.DB_PORT }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",              
+              {{- end }}              
             ]
           resources:
             {{- toYaml .Values.portal.server.waitForMongodb.resources | nindent 12 }}
diff --git a/charts/litmus/templates/server-deployment.yaml b/charts/litmus/templates/server-deployment.yaml
@@ -39,9 +39,13 @@ spec:
           image: {{ .Values.image.imageRegistryName }}/{{ .Values.portal.server.waitForMongodb.image.repository }}:{{ .Values.portal.server.waitForMongodb.image.tag }}
           imagePullPolicy: {{ .Values.portal.server.waitForMongodb.image.pullPolicy }}
           command: ["/bin/sh", "-c"]
-          args:
+          args:      
             [
+              {{- if .Values.mongodb.enabled }}
                 "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.mongodb.service.ports.mongodb }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",
+              {{- else }}
+                "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.adminConfig.DB_PORT }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",              
+              {{- end }}    
             ]
           resources:
             {{- toYaml .Values.portal.server.waitForMongodb.resources | nindent 12 }}

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,11 @@ spec:`
`42`	`42`	`command: ["/bin/sh", "-c"]`
`43`	`43`	`args:`
`44`	`44`	`[`
	`45`	`+ {{- if .Values.mongodb.enabled }}`
`45`	`46`	`"while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.mongodb.service.ports.mongodb }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",`
	`47`	`+ {{- else }}`
	`48`	`+ "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.adminConfig.DB_PORT }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",`
	`49`	`+ {{- end }}`
`46`	`50`	`]`
`47`	`51`	`resources:`
`48`	`52`	`{{- toYaml .Values.portal.server.waitForMongodb.resources \| nindent 12 }}`