From d649c04028a5992eca9892ee8b2a47beb0a95360 Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <juan_ariza_cordoba@hotmail.com>
Date: Thu, 12 Apr 2018 12:09:54 +0200
Subject: [PATCH] Improving RabbitMQ chart NOTES.txt (#4873)

* Improving RabbitMQ chart NOTES.txt

* Rebase Master

* Adding 'echo' to those commands including  expressions

* Bumping Chart version
---
 stable/rabbitmq/Chart.yaml          |  2 +-
 stable/rabbitmq/templates/NOTES.txt | 45 +++++++++++++++++------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index cde2ed1dcb..d68f7bbe05 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 0.7.4
+version: 0.7.5
 appVersion: 3.7.4
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/stable/rabbitmq/templates/NOTES.txt b/stable/rabbitmq/templates/NOTES.txt
index d8385ed50f..eb751c76e3 100644
--- a/stable/rabbitmq/templates/NOTES.txt
+++ b/stable/rabbitmq/templates/NOTES.txt
@@ -1,54 +1,61 @@
 
 ** Please be patient while the chart is being deployed **
 
-  Credentials:
+Credentials:
 
-    echo Username      : {{ .Values.rabbitmq.username }}
+    Username      : {{ .Values.rabbitmq.username }}
     echo Password      : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath="{.data.rabbitmq-password}" | base64 --decode)
     echo ErLang Cookie : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath="{.data.rabbitmq-erlang-cookie}" | base64 --decode)
 
-  RabbitMQ can be accessed within the cluster on port {{ .Values.rabbitmq.nodePort }} at {{ template "rabbitmq.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
+RabbitMQ can be accessed within the cluster on port {{ .Values.rabbitmq.nodePort }} at {{ template "rabbitmq.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
-  To access for outside the cluster execute the following commands:
+To access for outside the cluster, perform the following steps:
 
 {{- if contains "NodePort" .Values.serviceType }}
 
+Obtain the NodePort IP and ports:
+
     export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
     export NODE_PORT_AMQP=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ template "rabbitmq.fullname" . }})
     export NODE_PORT_STATS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[3].nodePort}" services {{ template "rabbitmq.fullname" . }})
 
-  To Access the RabbitMQ AMQP port:
+To Access the RabbitMQ AMQP port:
 
-    echo amqp://$NODE_IP:$NODE_PORT_AMQP/
+    echo URL : amqp://$NODE_IP:$NODE_PORT_AMQP/
 
-  To Access the RabbitMQ Management interface:
+To Access the RabbitMQ Management interface:
 
-    echo http://$NODE_IP:$NODE_PORT_STATS/
+    echo URL : http://$NODE_IP:$NODE_PORT_STATS/
 
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "rabbitmq.fullname" . }}'
+Obtain the LoadBalancer IP:
+
+NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+      Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "rabbitmq.fullname" . }}'
 
     export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
 
-  To Access the RabbitMQ AMQP port:
+To Access the RabbitMQ AMQP port:
 
-    echo amqp://$SERVICE_IP:{{ .Values.rabbitmq.nodePort }}/
+    echo URL : amqp://$SERVICE_IP:{{ .Values.rabbitmq.nodePort }}/
 
-  To Access the RabbitMQ Management interface:
+To Access the RabbitMQ Management interface:
 
-    echo http://$SERVICE_IP:{{ .Values.rabbitmq.managerPort }}/
+    echo URL : http://$SERVICE_IP:{{ .Values.rabbitmq.managerPort }}/
 
 {{- else if contains "ClusterIP"  .Values.serviceType }}
 
-   kubectl port-forward {{ template "rabbitmq.fullname" . }}-0  --namespace {{ .Release.Namespace }} {{ .Values.rabbitmq.nodePort }}:{{ .Values.rabbitmq.nodePort }} {{ .Values.rabbitmq.managerPort }}:{{ .Values.rabbitmq.managerPort }}
+Create a proxy server between localhost and the Kubernetes API Server:
 
-  To Access the RabbitMQ AMQP port:
+    kubectl proxy --port 8002
 
-    echo amqp://127.0.0.1:{{ .Values.rabbitmq.nodePort }}/
+To Access the RabbitMQ AMQP port:
 
-  To Access the RabbitMQ Management interface:
+    URL : amqp://127.0.0.1:8002/api/v1/proxy/namespaces/{{ .Release.Namespace }}/services/{{ template "rabbitmq.fullname" . }}:{{ .Values.rabbitmq.nodePort }}/
+
+To Access the RabbitMQ Management interface:
+
+    URL : http://127.0.0.1:8002/api/v1/proxy/namespaces/{{ .Release.Namespace }}/services/{{ template "rabbitmq.fullname" . }}:{{ .Values.rabbitmq.managerPort }}/
 
-    echo URL : http://127.0.0.1:{{ .Values.rabbitmq.managerPort }}
 {{- end }}