From 8a1c00f879f5e72980b044ad820e89729185055c Mon Sep 17 00:00:00 2001 From: Bruno Jost Date: Thu, 18 Mar 2021 12:22:24 +0100 Subject: [PATCH] [bitnami/spring-cloud-dataflow]: rabbitmq passwordErrors only if rabbitmq is used (#5781) (#5819) Signed-off-by: Bruno Jost --- bitnami/spring-cloud-dataflow/Chart.yaml | 2 +- bitnami/spring-cloud-dataflow/templates/NOTES.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml index 846f2f85b8..87955dbddd 100644 --- a/bitnami/spring-cloud-dataflow/Chart.yaml +++ b/bitnami/spring-cloud-dataflow/Chart.yaml @@ -39,4 +39,4 @@ sources: - https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow - https://github.com/bitnami/bitnami-docker-spring-cloud-skipper - https://dataflow.spring.io/ -version: 2.9.0 +version: 2.9.1 diff --git a/bitnami/spring-cloud-dataflow/templates/NOTES.txt b/bitnami/spring-cloud-dataflow/templates/NOTES.txt index c7ed93eba4..92254577d1 100644 --- a/bitnami/spring-cloud-dataflow/templates/NOTES.txt +++ b/bitnami/spring-cloud-dataflow/templates/NOTES.txt @@ -80,10 +80,12 @@ To access Spring Cloud Data Flow dashboard from outside the cluster execute the {{- $passwordErrors = append $passwordErrors $passwordMysqlErrors -}} {{/* Rabbitmq required password */}} +{{- if or (.Values.rabbitmq.enabled) (and (.Values.externalRabbitmq.enabled) (not .Values.externalRabbitmq.existingPasswordSecret)) -}} {{- $requiredRabbitmqPassword := dict "valueKey" "rabbitmq.auth.password" "secret" $secretNameRabbitmq "field" "rabbitmq-password" -}} {{- $requiredErlangPassword := dict "valueKey" "rabbitmq.auth.erlangCookie" "secret" $secretNameRabbitmq "field" "rabbitmq-erlang-cookie" -}} {{- $requiredRabbitmqPasswordErrors := include "common.validations.values.multiple.empty" (dict "required" (list $requiredRabbitmqPassword $requiredErlangPassword) "context" $) -}} {{- $passwordErrors = append $passwordErrors $requiredRabbitmqPasswordErrors -}} +{{- end }} {{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" $passwordErrors "context" $) -}}