From 1c469de9087eef7edff600aca36e182e9f1034c8 Mon Sep 17 00:00:00 2001
From: Shane Starcher <shanestarcher@gmail.com>
Date: Fri, 10 Jan 2020 11:14:34 -0800
Subject: [PATCH] workaround ELB healthcheck ssl bug (#20039)

https://github.com/kubernetes/kubernetes/issues/83070

Signed-off-by: Shane Starcher <shanestarcher@gmail.com>
---
 stable/rabbitmq-ha/Chart.yaml             |  2 +-
 stable/rabbitmq-ha/templates/service.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml
index e882e67b3f..6846bb31ce 100644
--- a/stable/rabbitmq-ha/Chart.yaml
+++ b/stable/rabbitmq-ha/Chart.yaml
@@ -1,7 +1,7 @@
 name: rabbitmq-ha
 apiVersion: v1
 appVersion: 3.8.0
-version: 1.38.1
+version: 1.38.2
 description: Highly available RabbitMQ cluster, the open source message broker
   software that implements the Advanced Message Queuing Protocol (AMQP).
 keywords:
diff --git a/stable/rabbitmq-ha/templates/service.yaml b/stable/rabbitmq-ha/templates/service.yaml
index f10411ea41..0db8de4f2b 100644
--- a/stable/rabbitmq-ha/templates/service.yaml
+++ b/stable/rabbitmq-ha/templates/service.yaml
@@ -33,6 +33,12 @@ spec:
 {{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
 {{- end }}
   ports:
+    {{- if .Values.rabbitmqAmqpsSupport.enabled }}
+    - name: amqps
+      protocol: TCP
+      port: {{ .Values.rabbitmqAmqpsSupport.amqpsNodePort }}
+      targetPort: amqps
+    {{- end }}
     - name: http
       protocol: TCP
       port: {{ .Values.rabbitmqManagerPort }}
@@ -86,12 +92,6 @@ spec:
       port: 15675
       targetPort: mqtt-ws
     {{- end }}
-    {{- if .Values.rabbitmqAmqpsSupport.enabled }}
-    - name: amqps
-      protocol: TCP
-      port: {{ .Values.rabbitmqAmqpsSupport.amqpsNodePort }}
-      targetPort: amqps
-    {{- end }}
     {{ if .Values.prometheus.exporter.enabled }}
     - name: exporter
       protocol: TCP