use autopopulated vals for rmq host/port

helm/templates/NOTES.txt

@@ -16,13 +16,15 @@ This is applicable when no passwords are set and therefore the random password i
 
 More information about the credentials may be found at https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues/#credential-errors-while-upgrading-chart-releases.
 
-RabbitMQ can be accessed within the cluster on port {{ .Values.rabbitmq.hostport }} at {{ .Values.rabbitmq.hostname }}
+{{- $rmqHostPort := default .Values.rabbitmq.service.ports.amqp .Values.rabbitmq.hostport -}}
+
+RabbitMQ can be accessed within the cluster on port {{ $rmqHostPort }} at {{ include "idxworker.rabbitmq.hostname" . }}
 
 Access the web console by port-forwarding:
 
-kubectl -n {{ .Release.Namespace }} port-forward pod/{{ .Release.Name }}-rabbitmq-0 {{ .Values.rabbitmq.hostport }}:{{ .Values.rabbitmq.hostport }} &
+kubectl -n {{ .Release.Namespace }} port-forward pod/{{ .Release.Name }}-rabbitmq-0 {{ $rmqHostPort }}:{{ $rmqHostPort }} &
 
-...then login to the Rabbitmq web console: http://localhost:{{ .Values.rabbitmq.hostport }}
+...then login to the Rabbitmq web console: http://localhost:{{ $rmqHostPort }}
 
 {{- if .Values.rabbitmq.metrics.enabled }}
 
@@ -53,9 +55,9 @@ To get the Solr credentials execute the following commands:
 
 Connect to the SOLR Dashboard by creating a kube proxy, and then browse to the local address:
 
-kubectl -n {{ .Release.Namespace }} port-forward service/{{ .Release.Name }}-solr {{ .Values.global.solrPort }}:{{ .Values.rabbitmq.hostport }} &
+kubectl -n {{ .Release.Namespace }} port-forward service/{{ .Release.Name }}-solr {{ .Values.global.solrPort }}:{{ .Values.global.solrPort }} &
 
-Solr URL: http://127.0.0.1:{{ .Values.rabbitmq.hostport }}/solr/
+Solr URL: http://127.0.0.1:{{ .Values.global.solrPort }}/solr/
 
 {{- if .Values.solr.metrics.enabled  }}
 

helm/templates/_helpers.tpl

@@ -60,3 +60,14 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+set RabbitMQ HostName
+*/}}
+{{- define "idxworker.rabbitmq.hostname" -}}
+{{- if not .Values.rabbitmq.hostname }}
+{{- .Release.Name }}-rabbitmq-headless
+{{- else }}
+{{- .Values.rabbitmq.hostname }}
+{{- end }}
+{{- end }}

helm/templates/deployment.yaml

@@ -85,7 +85,8 @@ spec:
             - sh
             - -c
             - >
-              until nc -z {{ .Values.rabbitmq.hostname }} {{ .Values.rabbitmq.hostport }} >
+              until nc -z {{ include "idxworker.rabbitmq.hostname" . }}{{- print " " }}
+              {{- default .Values.rabbitmq.service.ports.amqp .Values.rabbitmq.hostport }} >
               {{- print " " }}/dev/null; do echo waiting for RabbitMQ; sleep 2; done;
         - name: init-solr
           image: busybox:latest

helm/values.yaml

@@ -114,7 +114,7 @@ rabbitmq:
   ## Leave this value unset (`hostname: ""`) to have it automatically populated
   ##
   hostname: ""
-  ## @param rabbitmq.hostname idxworker param: hostport of the rabbitmq service
+  ## @param rabbitmq.hostport idxworker param: hostport of the rabbitmq service
   ## Leave this value unset (`hostport: ""`) to have it automatically populated
   ##
   hostport: ""