migrate to rabbitmq cluster

Author: jeanetteclark

helm/Chart.lock

@@ -1,9 +1,6 @@
 dependencies:
-- name: rabbitmq
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.8.2
 - name: solr
   repository: https://charts.bitnami.com/bitnami
   version: 9.5.5
-digest: sha256:b418a57d046777dbd5a4fc190bc2d908644e4f48a598e40b3d0484b0e476c896
-generated: "2026-04-09T14:45:00.970238-07:00"
+digest: sha256:4438fd9755628633ea4f218a8eb3823cd16eb3e462162d19bd29760dfa3f492b
+generated: "2026-04-17T14:19:25.055542-07:00"

helm/Chart.yaml

@@ -34,10 +34,6 @@ appVersion: "v.3.2.3"
 # Chart dependencies - also see https://github.com/bitnami/charts/tree/main/bitnami
 dependencies:
   # remote
-  - name: rabbitmq
-    version: "12.8.2"
-    repository: "https://charts.bitnami.com/bitnami"
-    condition: rabbitmq.enabled
   - name: solr
     version: "9.5.5"
     repository: "https://charts.bitnami.com/bitnami"

helm/templates/rabbitmq.yaml

@@ -0,0 +1,60 @@
+{{- if .Values.rabbitmq.enabled }}
+### RabbitMQ Cluster Configuration
+## --------------------------------------
+## This manifest deploys a RabbitMQ cluster using the RabbitMQ Cluster Operator.
+## See:
+##   https://www.rabbitmq.com/kubernetes/operator/using-operator
+##   https://www.rabbitmq.com/docs/production-checklist
+##   https://github.com/rabbitmq/cluster-operator/tree/main/docs/examples/production-ready
+
+apiVersion: rabbitmq.com/v1beta1
+kind: RabbitmqCluster
+metadata:
+  name: {{ include "metadig.fullname" . }}-rabbitmq
+  labels:
+    app: rabbitmq
+spec:
+  secretBackend:
+    externalSecret:
+      name: {{ .Values.rabbitmq.auth.existingPasswordSecret }}
+
+  {{- if .Values.rabbitmq.affinity }}
+    {{- with .Values.rabbitmq.affinity }}
+  affinity:
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- else if and .Values.rabbitmq.autoPodAntiAffinity .Values.rabbitmq.autoPodAntiAffinity.enabled }}
+  affinity:
+    podAntiAffinity:
+    {{- if .Values.rabbitmq.autoPodAntiAffinity.force }}
+      requiredDuringSchedulingIgnoredDuringExecution:
+    {{- else }}
+      preferredDuringSchedulingIgnoredDuringExecution:
+    {{- end }}
+      - weight: {{ .Values.rabbitmq.autoPodAntiAffinity.weight }}
+        podAffinityTerm:
+          labelSelector:
+            matchLabels:
+              app.kubernetes.io/name: {{ include "metadig.fullname" . }}-rabbitmq
+          topologyKey: "kubernetes.io/hostname"
+  {{- end }}
+  replicas: {{ .Values.rabbitmq.replicaCount }}
+  resources:
+    {{ toYaml .Values.rabbitmq.resources | nindent 4 }}
+  rabbitmq:
+    {{- if .Values.rabbitmq.envConfig }}
+    envConfig: |
+      {{- range $k, $v := .Values.rabbitmq.envConfig }}
+      {{ $k }}={{ $v | quote }}
+      {{- end }}
+    {{- end }}
+    {{- if .Values.rabbitmq.additionalConfig }}
+    additionalConfig: |
+      {{- range $k, $v := .Values.rabbitmq.additionalConfig }}
+      {{ $k }} = {{ $v }}
+      {{- end }}
+    {{- end }}
+  persistence:
+    storageClassName: {{ .Values.rabbitmq.persistence.storageClassName }}
+    storage: {{ .Values.rabbitmq.persistence.size }}
+{{- end }}

helm/values.yaml

@@ -15,7 +15,7 @@ tasksPath: "config/taskList.csv"
 downloadsPath: "config/downloadsList.csv"
 
 # Set to TRACE, DEBUG, INFO, WARN, or ERROR
-logLevel: "ERROR"
+logLevel: "DEBUG"
 
 serviceAccount:
   # Specifies whether a service account should be created
@@ -403,47 +403,30 @@ worker:
 
 rabbitmq:
   enabled: true
-  image:
-    registry: docker.io
-    repository: bitnamilegacy/rabbitmq
+
   auth:
     existingPasswordSecret: metadig-rmq-auth
-    username: metadig 
+    username: metadig
+
   replicaCount: 6
-  podSecurityContext:
-    enabled: false
-    fsGroup: 1001
-  podManagementPolicy: Parallel
-  service:
-    type: ClusterIP
-    externalTrafficPolicy: Cluster
+  
   resources:
     requests:
       cpu: 1
       memory: 2Gi
     limits:
       cpu: 2
       memory: 4Gi
-  ingress:
-    enabled: false
-    tls: false
-    ingressClassName: nginx
+      
   persistence:
-    enabled: true
-    storageClass: csi-rbd-sc
+    # Changed from 'storageClass' to match your template's 'storageClassName'
+    storageClassName: csi-rbd-sc
     size: 10Gi
-  volumePermissions:
-    enabled: false
-    containerSecurityContext:
-      runAsUser: 1001
-  serviceAccount:
-    create: false
-    name: metadig
-  tls:
-    enabled: false
-  global:
-    security:
-      allowInsecureImages: true
+
+  # I am adding these blank blocks just so you know they are available 
+  # for your template's envConfig and additionalConfig mappings if you need them later!
+  envConfig: {}
+  additionalConfig: {}
 
 solr:
   auth: