From db3dd28bf64cc060615e03226030180d6c2f3dc9 Mon Sep 17 00:00:00 2001
From: Anthony <Cvballa3g0@gmail.com>
Date: Tue, 17 Nov 2020 11:38:46 -0500
Subject: [PATCH] [bitnami/rabbitmq] Allow for templating in extraSecrets
 (#4378)

---
 bitnami/rabbitmq/Chart.yaml             |  2 +-
 bitnami/rabbitmq/README.md              | 18 ++++++++++++++++--
 bitnami/rabbitmq/templates/secrets.yaml |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
index 2d9ecddae..52a47dc02 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.0.2
+version: 8.0.3
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 16860bb1b..ff3f47506 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -143,7 +143,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `sidecars`                                | Add additional sidecar containers to the RabbitMQ pod                                                                | `{}` (evaluated as a template)                               |
 | `extraVolumeMounts`                       | Optionally specify extra list of additional volumeMounts .                                                           | `{}`                                                         |
 | `extraVolumes`                            | Optionally specify extra list of additional volumes .                                                                | `{}`                                                         |
-| `extraSecrets`                            | Optionally specify extra secrets to be created by the chart.                                                         | `{}`                                                         |
+| `extraSecrets`                            | Optionally specify extra secrets to be created by the chart.                                                         | `{}` (evaluated as a template)                               |
 
 ### Exposure parameters
 
@@ -402,6 +402,13 @@ type: Opaque
 stringData:
   load_definition.json: |-
     {
+      "users": [
+        {
+          "name": "user",
+          "password": "CHANGEME",
+          "tags": "administrator"
+        }
+      ],
       "vhosts": [
         {
           "name": "/"
@@ -414,13 +421,20 @@ Then, specify the `load_definitions` property as an `extraConfiguration` pointin
 
 > Loading a definition will take precedence over any configuration done through [Helm values](#parameters).
 
-If needed, you can use `extraSecrets` to let the chart create the secret for you. This way, you don't need to manually create it before deploying a release. For example :
+If needed, you can use `extraSecrets` to let the chart create the secret for you. This way, you don't need to manually create it before deploying a release. These secrets can also be templated to use supplied chart values. For example:
 
 ```yaml
 extraSecrets:
   load-definition:
     load_definition.json: |
       {
+        "users": [
+          {
+            "name": "{{ .Values.auth.username }}",
+            "password": "{{ .Values.auth.password }}",
+            "tags": "administrator"
+          }
+        ],
         "vhosts": [
           {
             "name": "/"
diff --git a/bitnami/rabbitmq/templates/secrets.yaml b/bitnami/rabbitmq/templates/secrets.yaml
index e3e840eef..fa07f1e62 100644
--- a/bitnami/rabbitmq/templates/secrets.yaml
+++ b/bitnami/rabbitmq/templates/secrets.yaml
@@ -31,5 +31,5 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels: {{- include "common.labels.standard" $ | nindent 4 }}
 type: Opaque
-stringData: {{- $value | toYaml | nindent 2 }}
+stringData: {{- include "common.tplvalues.render" (dict "value" $value "context" $) | nindent 2 }}
 {{- end }}