From 4937d48a18b4c5580da07cdcf0cfe9dab2d262da Mon Sep 17 00:00:00 2001
From: Devedse <2350015+devedse@users.noreply.github.com>
Date: Mon, 13 Dec 2021 09:57:29 +0100
Subject: [PATCH] [bitnami/RabbitMQ] Allow to set nodePort when type is
 LoadBalancer for all ports (#8369)

---
 bitnami/rabbitmq/Chart.yaml         | 2 +-
 bitnami/rabbitmq/templates/svc.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
index 14c705bb0..7b1edb651 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.24.11
+version: 8.24.12
diff --git a/bitnami/rabbitmq/templates/svc.yaml b/bitnami/rabbitmq/templates/svc.yaml
index 5b60fc150..ad193fd22 100644
--- a/bitnami/rabbitmq/templates/svc.yaml
+++ b/bitnami/rabbitmq/templates/svc.yaml
@@ -58,7 +58,7 @@ spec:
       targetPort: epmd
       {{- if (eq .Values.service.type "ClusterIP") }}
       nodePort: null
-      {{- else if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.epmdNodePort))) }}
+      {{- else if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.epmdNodePort)) }}
       nodePort: {{ .Values.service.epmdNodePort }}
       {{- end }}
     - name: {{ .Values.service.distPortName }}
@@ -66,7 +66,7 @@ spec:
       targetPort: dist
       {{- if eq .Values.service.type "ClusterIP" }}
       nodePort: null
-      {{- else if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.distNodePort))) }}
+      {{- else if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.distNodePort)) }}
       nodePort: {{ .Values.service.distNodePort }}
       {{- end }}
     {{- if .Values.service.managerPortEnabled }}
@@ -85,7 +85,7 @@ spec:
       targetPort: metrics
       {{- if eq .Values.service.type "ClusterIP" }}
       nodePort: null
-      {{- else if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.metricsNodePort))) }}
+      {{- else if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.metricsNodePort)) }}
       nodePort: {{ .Values.service.metricsNodePort }}
       {{- end }}
     {{- end }}