From 16d402d9125a1c6b04b7efb3d155035bb2b42742 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 6 Dec 2022 15:42:18 +0000
Subject: [PATCH] feat: add option mqtt support, rabbitmq-operator trial

---
 charts/kubezero-mq/Chart.yaml                 | 11 +++++--
 .../templates/rabbitmq/istio-service.yaml     | 26 +++++++++-------
 charts/kubezero-mq/values.yaml                | 31 +++++++++++++++++--
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/charts/kubezero-mq/Chart.yaml b/charts/kubezero-mq/Chart.yaml
index 09dd239..d07bb66 100644
--- a/charts/kubezero-mq/Chart.yaml
+++ b/charts/kubezero-mq/Chart.yaml
@@ -2,13 +2,14 @@ apiVersion: v2
 name: kubezero-mq
 description: KubeZero umbrella chart for MQ systems like NATS, RabbitMQ
 type: application
-version: 0.3.0
+version: 0.3.3
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
   - kubezero
-  - nats
   - rabbitmq
+  - rabbitmq-cluster-operator
+  - nats
 maintainers:
   - name: Stefan Reimer
     email: stefan@zero-downtime.net
@@ -21,7 +22,11 @@ dependencies:
     #repository: https://nats-io.github.io/k8s/helm/charts/
     condition: nats.enabled
   - name: rabbitmq
-    version: 11.1.1
+    version: 11.1.5
     repository: https://charts.bitnami.com/bitnami
     condition: rabbitmq.enabled
+  - name: rabbitmq-cluster-operator
+    version: 3.1.4
+    repository: https://charts.bitnami.com/bitnami
+    condition: rabbitmq-cluster-operator.enabled
 kubeVersion: ">= 1.20.0"
diff --git a/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml b/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml
index 038510e..4de10a1 100644
--- a/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml
+++ b/charts/kubezero-mq/templates/rabbitmq/istio-service.yaml
@@ -11,25 +11,27 @@ spec:
   - {{ .Values.rabbitmq.istio.gateway }}
   hosts:
 {{ toYaml .Values.rabbitmq.hosts | indent 2 }}
-  tcp:
-  - match:
-    - port: 5672
-    route:
+  http:
+  - route:
     - destination:
-        host: rabbitmq-headless
+        host: rabbitmq
         port:
-          number: 5672
+          number: 15672
+  tcp:
   - match:
     - port: 5671
     route:
     - destination:
-        host: rabbitmq-headless
+        host: rabbitmq
         port:
-          number: 5671
-  http:
-  - route:
+          number: 5672
+  {{- if .Values.rabbitmq.istio.mqtts }}
+  - match:
+    - port: 8883
+    route:
     - destination:
-        host: rabbitmq-headless
+        host: rabbitmq
         port:
-          number: 15672
+          number: 1883
+  {{- end }}
 {{- end }}
diff --git a/charts/kubezero-mq/values.yaml b/charts/kubezero-mq/values.yaml
index 5b2e937..b2d744d 100644
--- a/charts/kubezero-mq/values.yaml
+++ b/charts/kubezero-mq/values.yaml
@@ -23,6 +23,26 @@ nats:
     # url: "mq.example.com"
     gateway: istio-ingress/private-ingressgateway
 
+# rabbitmq cluster operator
+rabbitmq-cluster-operator:
+  enabled: false
+  rabbitmqImage:
+    tag: 3.11.4-debian-11-r0
+
+  useCertManager: true
+
+  clusterOperator:
+    metrics:
+      enabled: false
+      serviceMonitor:
+        enabled: true
+
+  msgTopologyOperator:
+    metrics:
+      enabled: false
+      serviceMonitor:
+        enabled: true
+
 # rabbitmq
 rabbitmq:
   enabled: false
@@ -36,6 +56,7 @@ rabbitmq:
   istio:
     enabled: false
     gateway: istio-ingress/private-ingressgateway
+    mqtts: false
 
   auth:
     existingPasswordSecret: rabbitmq
@@ -47,7 +68,8 @@ rabbitmq:
       existingSecretFullChain: true
   
   clustering:
-    forceBoot: true
+    enabled: false
+    forceBoot: false
   
   resources:
     requests:
@@ -56,6 +78,9 @@ rabbitmq:
   
   replicaCount: 1
   
+  persistence:
+    size: 2Gi
+
   podAntiAffinityPreset: ""
   topologySpreadConstraints: |-
     - maxSkew: 1
@@ -70,9 +95,9 @@ rabbitmq:
         matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
  
   pdb:
-    create: true
+    create: false
   
   metrics:
     enabled: false
     serviceMonitor:
-      enabled: false
+      enabled: true