fix mongo/rabbitmq

Author: robkooper

Chart.yaml

@@ -13,7 +13,7 @@ description: >
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.15.4
+version: 0.15.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -55,4 +55,4 @@ annotations:
     - name: Helm Chart
       url: https://github.com/clowder-framework/clowder-helm
   artifacthub.io/changes: |
-    - fix name of extractors to be fullname
+    - fix mongodb/rabbitmq url

README.md

@@ -167,6 +167,9 @@ extraConfig:
 
 ## ChangeLog
 
+### 0.15.5
+- fix rabbitmq/mongodb url
+
 ### 0.15.4
 - fix name of extractors to be fullname
 

templates/_helpers.tpl

@@ -48,7 +48,12 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Mongo URI
 */}}
 {{- define "clowder.mongodburi" -}}
-mongodb://{{ include "clowder.fullname" . }}-mongodb:27017/clowder
+{{- if .Values.mongodb.enabled -}}
+{{- $server := printf "%s-mongodb" .Release.Name -}}
+{{- printf "mongodb://%s:27017/clowder" $server -}}
+{{- else -}}
+{{- required "Need to provide a uri for MongoDB" .Values.mongodb.uri -}}
+{{- end -}}
 {{- end -}}
 
 {{/*
@@ -58,7 +63,7 @@ RabbitMQ URI
 {{- if .Values.rabbitmq.enabled -}}
 {{- $username := default "guest" .Values.rabbitmq.auth.username -}}
 {{- $password := default "guest" .Values.rabbitmq.auth.password -}}
-{{- $server := printf "%s-rabbitmq" (include "clowder.fullname" .) -}}
+{{- $server := printf "%s-rabbitmq" .Release.Name -}}
 {{- printf "amqp://%s:%s@%s/%s" $username $password $server "%2F" -}}
 {{- else -}}
 {{- required "Need to provide a uri for RabbitMQ" .Values.rabbitmq.uri -}}

templates/monitor/deployment.yaml

@@ -32,7 +32,7 @@ spec:
                   name: {{ include "clowder.fullname" . }}
                   key: rabbitmq-uri
       containers:
-        - name: {{ .Chart.Name }}
+        - name: monitor
           image: "{{ .Values.image.repository }}/monitor:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports: