From fbb0ef314ecceb974068be95b22a4a6490e20735 Mon Sep 17 00:00:00 2001
From: Sergey Shaykhullin <46970457+sergeyshaykhullin@users.noreply.github.com>
Date: Mon, 18 Jan 2021 11:12:54 +0300
Subject: [PATCH] [bitnami/rabbitmq] Fix critical rabbitmq helm scope bug
 (#5062)

* Fix rabbitmq helm scope bug

* Bump chart
---
 bitnami/rabbitmq/Chart.yaml             | 2 +-
 bitnami/rabbitmq/templates/secrets.yaml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
index 7f3d2e834..9b0690fb5 100644
--- a/bitnami/rabbitmq/Chart.yaml
+++ b/bitnami/rabbitmq/Chart.yaml
@@ -23,4 +23,4 @@ name: rabbitmq
 sources:
   - https://github.com/bitnami/bitnami-docker-rabbitmq
   - https://www.rabbitmq.com
-version: 8.7.0
+version: 8.7.1
diff --git a/bitnami/rabbitmq/templates/secrets.yaml b/bitnami/rabbitmq/templates/secrets.yaml
index 1ad3c89d8..882717fb0 100644
--- a/bitnami/rabbitmq/templates/secrets.yaml
+++ b/bitnami/rabbitmq/templates/secrets.yaml
@@ -22,12 +22,13 @@ data:
   {{- end }}
   {{- end }}
 {{- end }}
+{{- $extraSecretsPrependReleaseName := .Values.extraSecretsPrependReleaseName }}
 {{- range $key, $value := .Values.extraSecrets }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  {{- if .Values.extraSecretsPrependReleaseName }}
+  {{- if $extraSecretsPrependReleaseName }}
   name: {{ $.Release.Name }}-{{ $key }}
   {{- else }}
   name: {{ $key }}