From 8d0be4f3cdd1b7ddaeefabbad8d4ff5f2a21f7ae Mon Sep 17 00:00:00 2001 From: Alexandru Mahmoud Date: Tue, 18 Aug 2020 03:53:13 -0400 Subject: [PATCH] [bitnami/rabbitmq] Run secret name through tpl (#3222) (#3445) --- bitnami/rabbitmq/Chart.yaml | 2 +- bitnami/rabbitmq/README.md | 2 +- bitnami/rabbitmq/templates/_helpers.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml index ce79ec5ee..45fd45de6 100644 --- a/bitnami/rabbitmq/Chart.yaml +++ b/bitnami/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 7.6.1 +version: 7.6.2 appVersion: 3.8.6 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md index 07ce11c41..82f9b91ff 100644 --- a/bitnami/rabbitmq/README.md +++ b/bitnami/rabbitmq/README.md @@ -73,7 +73,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `image.debug` | Set to true if you would like to see extra information on logs | `false` | | `auth.username` | RabbitMQ application username | `user` | | `auth.password` | RabbitMQ application password | _random 10 character long alphanumeric string_ | -| `auth.existingPasswordSecret` | Existing secret with RabbitMQ credentials | `nil` | +| `auth.existingPasswordSecret` | Existing secret with RabbitMQ credentials | `nil` (evaluated as a template) | | `auth.erlangCookie` | Erlang cookie | _random 32 character long alphanumeric string_ | | `auth.existingErlangSecret` | Existing secret with RabbitMQ Erlang cookie | `nil` | | `auth.tls.enabled` | Enable TLS support on RabbitMQ | `false` | diff --git a/bitnami/rabbitmq/templates/_helpers.tpl b/bitnami/rabbitmq/templates/_helpers.tpl index 20dcae3ac..4002ad0db 100644 --- a/bitnami/rabbitmq/templates/_helpers.tpl +++ b/bitnami/rabbitmq/templates/_helpers.tpl @@ -64,7 +64,7 @@ Get the password secret. */}} {{- define "rabbitmq.secretPasswordName" -}} {{- if .Values.auth.existingPasswordSecret -}} - {{- printf "%s" .Values.auth.existingPasswordSecret -}} + {{- printf "%s" (tpl .Values.auth.existingPasswordSecret $) -}} {{- else -}} {{- printf "%s" (include "rabbitmq.fullname" .) -}} {{- end -}}