match back to published chart as rabbitmq host doesnt seem to be feed…

…ing through
AlfrescoArchive · Aug 15, 2018 · 87eb9ab · 87eb9ab
1 parent 4ab623c
commit 87eb9ab
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/charts/example-runtime-bundle/templates/deployment.yaml b/charts/example-runtime-bundle/templates/deployment.yaml
@@ -33,9 +33,17 @@ spec:
         - name: SPRING_RABBITMQ_HOST
         {{- if .Values.global.rabbitmq.host.value }}
           value: "{{ .Values.global.rabbitmq.host.value }}"
-        {{- else }}
+        {{ else }}
           value: "{{ .Release.Name }}-rabbitmq"
-        {{- end }}
+        {{ end }}
+        - name: SPRING_RABBITMQ_USERNAME
+          value: {{ .Values.global.rabbitmq.username.value }}
+        - name: SPRING_RABBITMQ_HOST
+{{- if .Values.global.rabbitmq.host.value }}
+          value: "{{ .Values.global.rabbitmq.host.value }}"
+{{- else }}
+          value: "{{ .Release.Name }}-rabbitmq"
+{{- end }}
         - name: SPRING_RABBITMQ_USERNAME
           value: {{ .Values.global.rabbitmq.username.value }}
         - name: SPRING_RABBITMQ_PASSWORD
@@ -44,7 +52,6 @@ spec:
         - name: ACT_KEYCLOAK_URL
           value: "{{ .Values.global.keycloak.url }}"
 {{- end }}
-{{- if .Values.db.deployPostgres }}
         - name: SPRING_DATASOURCE_URL
   {{- if .Values.db.uri }}
           value: "{{ .Values.db.uri }}"