From 03cdc92a7ae6d65f1029a0961e5bca0d4ad586b9 Mon Sep 17 00:00:00 2001 From: Luke Alexander Date: Mon, 16 Sep 2019 17:56:38 +0100 Subject: [PATCH] [stable/rabbitmq-ha] add option to force creation of erlang cookie (#15418) * [stable/rabbitmq-ha] add option to force creation of erlang cookie Signed-off-by: Luke Alexander * fix README Signed-off-by: Luke Alexander * fix README Signed-off-by: Luke Alexander * bump Chart version Signed-off-by: Luke Alexander * use the RABBITMQ_ERLANG_COOKIE env var to force cookie Signed-off-by: Luke Alexander * remove any mention of setting rabbitmqErlangCookie Signed-off-by: Luke Alexander * Remove forceCookie in favour of explicitly setting the cookie via echo command Signed-off-by: Luke Alexander --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/templates/statefulset.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index ad92d56f44..51b37067d2 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.15 -version: 1.32.1 +version: 1.32.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/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml index f939406378..7ca2d2263a 100644 --- a/stable/rabbitmq-ha/templates/statefulset.yaml +++ b/stable/rabbitmq-ha/templates/statefulset.yaml @@ -53,7 +53,7 @@ spec: - | set -ex cp /configmap/* /etc/rabbitmq - rm -f /var/lib/rabbitmq/.erlang.cookie + echo "${RABBITMQ_ERLANG_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie {{- if .Values.forceBoot }} if [ -d "${RABBITMQ_MNESIA_DIR}" ]; then touch "${RABBITMQ_MNESIA_DIR}/force_load" @@ -67,6 +67,11 @@ spec: fieldPath: metadata.name - name: RABBITMQ_MNESIA_DIR value: /var/lib/rabbitmq/mnesia/rabbit@$(POD_NAME).{{ template "rabbitmq-ha.fullname" . }}-discovery.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + - name: RABBITMQ_ERLANG_COOKIE + valueFrom: + secretKeyRef: + name: {{ template "rabbitmq-ha.secretName" . }} + key: rabbitmq-erlang-cookie resources: {{ toYaml .Values.initContainer.resources | indent 12 }} volumeMounts: @@ -164,7 +169,7 @@ spec: {{- range $key, $value := .Values.env }} - name: {{ $key }} value: {{ $value | quote }} - {{- end }} + {{- end }} resources: {{ toYaml .Values.resources | indent 12 }} volumeMounts: