From 6943591a068ef096a853abe2a5eb15dcc5b0f15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20P=C3=B6hner?=
 <10630407+groundhog2k@users.noreply.github.com>
Date: Fri, 26 May 2023 10:01:20 +0200
Subject: [PATCH] Simplify rabbitmq configuration (#1245)

---
 charts/rabbitmq/Chart.yaml                 | 2 +-
 charts/rabbitmq/README.md                  | 2 +-
 charts/rabbitmq/RELEASENOTES.md            | 1 +
 charts/rabbitmq/templates/statefulset.yaml | 8 ++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index 8b99f7ad..77b87fdd 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.6.19"
+version: "0.6.20"
 
 appVersion: "3.11.16"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 79379c43..ce36961a 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![Version: 0.6.19](https://img.shields.io/badge/Version-0.6.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.16](https://img.shields.io/badge/AppVersion-3.11.16-informational?style=flat-square)
+![Version: 0.6.20](https://img.shields.io/badge/Version-0.6.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.16](https://img.shields.io/badge/AppVersion-3.11.16-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 0e601c44..c767708e 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -77,4 +77,5 @@
 | 0.6.17 | 3.11.16 | Upgraded to RabbitMQ 3.11.16 |
 | 0.6.18 | 3.11.16 | Simplified configuration options |
 | 0.6.19 | 3.11.16 | Simplified and refactored SSL/TLS configuration options |
+| 0.6.20 | 3.11.16 | Fixed erlang cookie initialization |
 | | | |
diff --git a/charts/rabbitmq/templates/statefulset.yaml b/charts/rabbitmq/templates/statefulset.yaml
index 0c3f7eca..a1e49be3 100644
--- a/charts/rabbitmq/templates/statefulset.yaml
+++ b/charts/rabbitmq/templates/statefulset.yaml
@@ -50,6 +50,14 @@ spec:
             - name: ERLANG_COOKIE
               value: {{ .Values.authentication.erlangCookie }}
             {{- end }}
+          {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          envFrom:
+          {{- range .Values.extraEnvSecrets }}
+            - secretRef:
+                name: {{ . }}
+          {{- end }}
           volumeMounts:
             - name: config
               mountPath: /etc/rabbitmq
-- 
GitLab