[bitnami/spring-cloud-dataflow]: rabbitmq passwordErrors only if rabbitmq is used (#5781) (#5819)

Signed-off-by: Bruno Jost <bruno.jost@bedag.ch>
This commit is contained in:
Bruno Jost
2021-03-18 12:22:24 +01:00
committed by GitHub
parent 65747e81bc
commit 8a1c00f879
2 changed files with 3 additions and 1 deletions

View File

@@ -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

View File

@@ -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" $) -}}