From a5c96004152a74a8e234756d5b2bd352c985e9aa Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Mon, 20 Jun 2022 14:47:48 +0200 Subject: [PATCH] Update helpers to ensure scdf.rabbitmq.port is assigned a default value if not in values.yaml (#10448) Added definition to values.schema.json Fixes #10446 Signed-off-by: Corneil du Plessis --- bitnami/spring-cloud-dataflow/Chart.yaml | 2 +- bitnami/spring-cloud-dataflow/templates/_helpers.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml index b21c1c1d0c..2378fea62c 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: 12.0.0 +version: 12.0.1 diff --git a/bitnami/spring-cloud-dataflow/templates/_helpers.tpl b/bitnami/spring-cloud-dataflow/templates/_helpers.tpl index d7386056f3..9b297fe81a 100644 --- a/bitnami/spring-cloud-dataflow/templates/_helpers.tpl +++ b/bitnami/spring-cloud-dataflow/templates/_helpers.tpl @@ -276,7 +276,7 @@ Return the RabbitMQ Port */}} {{- define "scdf.rabbitmq.port" -}} {{- if .Values.rabbitmq.enabled }} - {{- printf "%d" (.Values.rabbitmq.service.port | int ) -}} + {{- printf "%d" (.Values.rabbitmq.service.ports.amqp | int ) -}} {{- else -}} {{- printf "%d" (.Values.externalRabbitmq.port | int ) -}} {{- end -}}