From 8f501b38c9b7932476132a193a34a239e4f0d166 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 12 Jan 2023 21:58:32 +0000
Subject: [PATCH] Latest RabbitMQ tweaks

---
 charts/kubezero-mq/Chart.yaml                            | 4 ++--
 charts/kubezero-mq/templates/rabbitmq/istio-service.yaml | 9 +++++++++
 charts/kubezero-mq/values.yaml                           | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/charts/kubezero-mq/Chart.yaml b/charts/kubezero-mq/Chart.yaml
index 305dde70..b06b7fde 100644
--- a/charts/kubezero-mq/Chart.yaml
+++ b/charts/kubezero-mq/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-mq
 description: KubeZero umbrella chart for MQ systems like NATS, RabbitMQ
 type: application
-version: 0.3.3
+version: 0.3.4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -22,7 +22,7 @@ dependencies:
     #repository: https://nats-io.github.io/k8s/helm/charts/
     condition: nats.enabled
   - name: rabbitmq
-    version: 11.1.5
+    version: 11.3.2
     repository: https://charts.bitnami.com/bitnami
     condition: rabbitmq.enabled
   - name: rabbitmq-cluster-operator
diff --git a/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml b/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml
index 4de10a1d..ef59f2d9 100644
--- a/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml
+++ b/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml
@@ -34,4 +34,13 @@ spec:
         port:
           number: 1883
   {{- end }}
+  {{- if .Values.rabbitmq.istio.mqtt }}
+  - match:
+    - port: 1883
+    route:
+    - destination:
+        host: rabbitmq
+        port:
+          number: 1883
+  {{- end }}
 {{- end }}
diff --git a/charts/kubezero-mq/values.yaml b/charts/kubezero-mq/values.yaml
index b2d744de..126c5621 100644
--- a/charts/kubezero-mq/values.yaml
+++ b/charts/kubezero-mq/values.yaml
@@ -56,6 +56,7 @@ rabbitmq:
   istio:
     enabled: false
     gateway: istio-ingress/private-ingressgateway
+    mqtt: false
     mqtts: false
 
   auth: