From a5cab9373caacaf81746ff978a9e5cd10971a572 Mon Sep 17 00:00:00 2001
From: bitnami-bot <containers-bot@bitnami.com>
Date: Mon, 8 Oct 2018 10:37:18 +0000
Subject: [PATCH] Synchronize upstreamed folder to 1277af4

---
 upstreamed/rabbitmq/Chart.yaml                  | 2 +-
 upstreamed/rabbitmq/templates/statefulset.yaml  | 6 ++++--
 upstreamed/rabbitmq/templates/svc-headless.yaml | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml
index f16e013318..e21c68ce2a 100644
--- a/upstreamed/rabbitmq/Chart.yaml
+++ b/upstreamed/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 3.3.3
+version: 3.3.6
 appVersion: 3.7.8
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml
index 8f393780c3..a4241353a7 100644
--- a/upstreamed/rabbitmq/templates/statefulset.yaml
+++ b/upstreamed/rabbitmq/templates/statefulset.yaml
@@ -55,6 +55,8 @@ spec:
          - bash
          - -ec
          - |
+            mkdir -p /opt/bitnami/rabbitmq/.rabbitmq/
+            mkdir -p /opt/bitnami/rabbitmq/etc/rabbitmq/
             #persist the erlang cookie in both places for server and cli tools
             echo $RABBITMQ_ERL_COOKIE > /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie
             cp /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie /opt/bitnami/rabbitmq/.rabbitmq/
@@ -108,9 +110,9 @@ spec:
         env:
         {{- if .Values.image.debug}}
           - name: BASH_DEBUG
-            value: 1
+            value: "1"
           - name: NAMI_DEBUG
-            value: 1
+            value: "1"
         {{- end }}
           - name: MY_POD_IP
             valueFrom:
diff --git a/upstreamed/rabbitmq/templates/svc-headless.yaml b/upstreamed/rabbitmq/templates/svc-headless.yaml
index 4ca86c2576..888bd25834 100644
--- a/upstreamed/rabbitmq/templates/svc-headless.yaml
+++ b/upstreamed/rabbitmq/templates/svc-headless.yaml
@@ -14,13 +14,13 @@ spec:
     port: 4369
     targetPort: epmd
   - name: amqp
-    port: {{ .Values.rabbitmq.nodePort }}
+    port: {{ .Values.rabbitmq.amqpPort }}
     targetPort: amqp
     {{- if (and (eq .Values.serviceType "NodePort") (not (empty .Values.rabbitmq.nodePort))) }}
     nodePort: {{ .Values.rabbitmq.nodePort }}
     {{- end }}
   - name: dist
-    port: {{ .Values.rabbitmq.nodePort | add 20000 }}
+    port: {{ .Values.rabbitmq.distPort }}
     targetPort: dist
   - name: stats
     port: {{ .Values.rabbitmq.managerPort }}