From 1eae84015f7cecdbee0191786632fabb26a3e80e Mon Sep 17 00:00:00 2001
From: "a.b.christie" <alan.christie@matildapeak.com>
Date: Mon, 8 Dec 2025 14:07:25 +0000
Subject: [PATCH 1/6] feat: Initial rabbitmq cluster operator changes

---
 roles/infrastructure/defaults/main.yaml       |   4 +-
 .../infrastructure/tasks/deploy-rabbitmq.yaml |  83 +---------
 .../templates/configmap-rabbitmq-conf.yaml.j2 |  18 ---
 .../configmap-rabbitmq-plugins.yaml.j2        |   9 --
 .../templates/pvc-rabbitmq-data.yaml.j2       |  15 --
 .../templates/pvc-rabbitmq-log.yaml.j2        |  15 --
 .../templates/rabbitmqcluster.yaml.j2         |  25 +++
 .../templates/service-rabbitmq.yaml.j2        |  25 ---
 .../templates/statefulset-rabbitmq.yaml.j2    | 146 ------------------
 roles/infrastructure/vars/main.yaml           |   7 -
 10 files changed, 30 insertions(+), 317 deletions(-)
 delete mode 100644 roles/infrastructure/templates/configmap-rabbitmq-conf.yaml.j2
 delete mode 100644 roles/infrastructure/templates/configmap-rabbitmq-plugins.yaml.j2
 delete mode 100644 roles/infrastructure/templates/pvc-rabbitmq-data.yaml.j2
 delete mode 100644 roles/infrastructure/templates/pvc-rabbitmq-log.yaml.j2
 create mode 100644 roles/infrastructure/templates/rabbitmqcluster.yaml.j2
 delete mode 100644 roles/infrastructure/templates/service-rabbitmq.yaml.j2
 delete mode 100644 roles/infrastructure/templates/statefulset-rabbitmq.yaml.j2

diff --git a/roles/infrastructure/defaults/main.yaml b/roles/infrastructure/defaults/main.yaml
index 83c3552..1a6b700 100644
--- a/roles/infrastructure/defaults/main.yaml
+++ b/roles/infrastructure/defaults/main.yaml
@@ -122,7 +122,7 @@ rabbitmq_cert_issuer: production
 rabbitmq_user: admin
 rabbitmq_user_password: "{{ lookup('password', '/dev/null length=12 chars=ascii_letters') }}"
 
+rabbitmq_replicas: 1
+
 rabbitmq_vol_storageclass: " "
 rabbitmq_vol_size_g: 1
-rabbitmq_log_vol_storageclass: " "
-rabbitmq_log_vol_size_g: 1
diff --git a/roles/infrastructure/tasks/deploy-rabbitmq.yaml b/roles/infrastructure/tasks/deploy-rabbitmq.yaml
index 228624b..980935b 100644
--- a/roles/infrastructure/tasks/deploy-rabbitmq.yaml
+++ b/roles/infrastructure/tasks/deploy-rabbitmq.yaml
@@ -16,40 +16,6 @@
   ansible.builtin.assert:
     that: n_result.resources | length == 1
 
-# Secrets (RabbitMQ) ----------------------------------------------------------
-
-- name: Create RabbitMQ Secret
-  when: rabbitmq_state|string == 'present'
-  block:
-
-  - name: Check RabbitMQ secrets
-    kubernetes.core.k8s_info:
-      kind: Secret
-      api_version: v1
-      namespace: "{{ infra_namespace }}"
-      name: im-rabbitmq
-    register: rmq_s_result
-
-  - name: Set RabbitMQ secret facts
-    ansible.builtin.set_fact:
-      rabbitmq_user_fact: "{{ rabbitmq_user }}"
-      rabbitmq_user_password_fact: "{{ rabbitmq_user_password }}"
-      rabbitmq_erlang_cookie_fact: "{{ rabbitmq_erlang_cookie }}"
-    when: rmq_s_result.resources | length == 0
-
-  - name: Set RabbitMQ secret facts (pre-deployed secrets)
-    ansible.builtin.set_fact:
-      rabbitmq_user_fact: "{{ rmq_s_result.resources[0].data.user | b64decode }}"
-      rabbitmq_user_password_fact: "{{ rmq_s_result.resources[0].data.password | b64decode }}"
-      rabbitmq_erlang_cookie_fact: "{{ rmq_s_result.resources[0].data.erlang_cookie | b64decode }}"
-    when: rmq_s_result.resources | length == 1
-
-  - name: Write RabbitMQ secrets
-    kubernetes.core.k8s:
-      definition: "{{ lookup('template', 'secret-rabbitmq.yaml.j2') }}"
-      wait: yes
-    when: rmq_s_result.resources | length == 0
-
 # RabbitMQ --------------------------------------------------------------------
 
 - name: Deploy RabbitMQ
@@ -60,68 +26,25 @@
       that:
       - kc_cert_issuer in cert_issuer_set
 
-  - name: Get {{ rabbitmq_vol_storageclass }} StorageClass
-    kubernetes.core.k8s_info:
-      kind: StorageClass
-      name: "{{ rabbitmq_vol_storageclass }}"
-    register: sc_result
-    when: rabbitmq_vol_storageclass != " "
-
-  - name: Assert {{ pg_vol_storageclass }} StorageClass
-    ansible.builtin.assert:
-      that: sc_result.resources | length == 1
-      fail_msg: The {{ rabbitmq_vol_storageclass }} StorageClass must be available on the cluster
-    when: rabbitmq_vol_storageclass != " "
-
-  - name: Create RabbitMQ volume claims
-    kubernetes.core.k8s:
-      definition: "{{ lookup('template', item) }}"
-      wait: yes
-      wait_timeout: "{{ wait_timeout }}"
-    loop:
-    - pvc-rabbitmq-data.yaml.j2
-    - pvc-rabbitmq-log.yaml.j2
-
-  # Best practice ... wait for the PVC to bind.
-  # e.g. wait until resources[0].status.phase == Bound (initially Pending)
-
-  - name: Wait for RabbitMQ volume claim to bind
-    kubernetes.core.k8s_info:
-      kind: PersistentVolumeClaim
-      name: rabbitmq-data
-      namespace: "{{ infra_namespace }}"
-    register: rabbitmq_pvc_result
-    until: >-
-      rabbitmq_pvc_result.resources | length > 0
-      and rabbitmq_pvc_result.resources[0].status is defined
-      and rabbitmq_pvc_result.resources[0].status.phase is defined
-      and rabbitmq_pvc_result.resources[0].status.phase == 'Bound'
-    delay: 5
-    retries: "{{ (bind_timeout | int / 5) | int }}"
-    when: wait_for_bind | bool
-
   - name: RabbitMQ
     kubernetes.core.k8s:
       definition: "{{ lookup('template', item) }}"
       wait: yes
       wait_timeout: "{{ wait_timeout }}"
     loop:
-    - configmap-rabbitmq-conf.yaml.j2
-    - configmap-rabbitmq-plugins.yaml.j2
-    - service-rabbitmq.yaml.j2
-    - statefulset-rabbitmq.yaml.j2
+    - rabbitmqcluster.yaml.j2
 
   - name: Wait for RabbitMQ to become Ready ({{ wait_timeout }} seconds)
     kubernetes.core.k8s_info:
       kind: Pod
-      name: rabbitmq-0
+      name: "{{ infra_namespace }}-server-0"
       namespace: "{{ infra_namespace }}"
     register: rabbitmq_result
     until: >-
       rabbitmq_result.resources | length == 1
       and rabbitmq_result.resources[0].status is defined
       and rabbitmq_result.resources[0].status.containerStatuses is defined
-      and rabbitmq_result.resources[0].status.containerStatuses | length == 1
+      and rabbitmq_result.resources[0].status.containerStatuses | length > 0
       and rabbitmq_result.resources[0].status.containerStatuses[0].ready
     delay: 30
     retries: "{{ (wait_timeout | int / 30) | int }}"
diff --git a/roles/infrastructure/templates/configmap-rabbitmq-conf.yaml.j2 b/roles/infrastructure/templates/configmap-rabbitmq-conf.yaml.j2
deleted file mode 100644
index e290938..0000000
--- a/roles/infrastructure/templates/configmap-rabbitmq-conf.yaml.j2
+++ /dev/null
@@ -1,18 +0,0 @@
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: rabbitmq-conf
-  namespace: {{ infra_namespace }}
-data:
-  rabbitmq.conf: |
-    # See https://www.rabbitmq.com/docs/logging
-    log.dir = /var/log/rabbitmq
-    log.file.level = debug
-    log.file.rotation.size = 10485760
-    log.file.rotation.count = 5
-    log.file.rotation.compress = true
-    management.tcp.port = 15672
-    management.tcp.ip = 0.0.0.0
-    stream.advertised_host = rabbitmq.{{ infra_namespace }}.svc.cluster.local'
-    stream.advertised_port = 5552
diff --git a/roles/infrastructure/templates/configmap-rabbitmq-plugins.yaml.j2 b/roles/infrastructure/templates/configmap-rabbitmq-plugins.yaml.j2
deleted file mode 100644
index 0776abd..0000000
--- a/roles/infrastructure/templates/configmap-rabbitmq-plugins.yaml.j2
+++ /dev/null
@@ -1,9 +0,0 @@
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: rabbitmq-plugins
-  namespace: {{ infra_namespace }}
-data:
-  enabled_plugins: |
-    [rabbitmq_management,rabbitmq_prometheus,rabbitmq_stream,rabbitmq_stream_management].
diff --git a/roles/infrastructure/templates/pvc-rabbitmq-data.yaml.j2 b/roles/infrastructure/templates/pvc-rabbitmq-data.yaml.j2
deleted file mode 100644
index 624c45b..0000000
--- a/roles/infrastructure/templates/pvc-rabbitmq-data.yaml.j2
+++ /dev/null
@@ -1,15 +0,0 @@
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: rabbitmq-data
-  namespace: {{ infra_namespace }}
-spec:
-  accessModes:
-  - ReadWriteOnce
-{% if rabbitmq_vol_storageclass != ' ' %}
-  storageClassName: {{ rabbitmq_vol_storageclass }}
-{% endif %}
-  resources:
-    requests:
-      storage: '{{ rabbitmq_vol_size_g }}Gi'
diff --git a/roles/infrastructure/templates/pvc-rabbitmq-log.yaml.j2 b/roles/infrastructure/templates/pvc-rabbitmq-log.yaml.j2
deleted file mode 100644
index 35299a8..0000000
--- a/roles/infrastructure/templates/pvc-rabbitmq-log.yaml.j2
+++ /dev/null
@@ -1,15 +0,0 @@
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: rabbitmq-log
-  namespace: {{ infra_namespace }}
-spec:
-  accessModes:
-  - ReadWriteOnce
-{% if rabbitmq_vol_storageclass != ' ' %}
-  storageClassName: {{ rabbitmq_vol_storageclass }}
-{% endif %}
-  resources:
-    requests:
-      storage: '{{ rabbitmq_log_vol_size_g }}Gi'
diff --git a/roles/infrastructure/templates/rabbitmqcluster.yaml.j2 b/roles/infrastructure/templates/rabbitmqcluster.yaml.j2
new file mode 100644
index 0000000..6176717
--- /dev/null
+++ b/roles/infrastructure/templates/rabbitmqcluster.yaml.j2
@@ -0,0 +1,25 @@
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: RabbitmqCluster
+metadata:
+  name: {{ infra_namespace }}
+  namespace: {{ infra_namespace }}
+spec:
+  replicas: {{ rabbitmq_replicas }}
+  rabbitmq:
+    additionalPlugins:
+    - rabbitmq_management
+    - rabbitmq_peer_discovery_k8s
+    - rabbitmq_prometheus
+    - rabbitmq_stream
+    - rabbitmq_stream_management
+  resources:
+    requests:
+      cpu: {{ rabbitmq_cpu_request }}
+      memory: {{ rabbitmq_mem_request }}
+    limits:
+      cpu: {{ rabbitmq_cpu_limit }}
+      memory: {{ rabbitmq_mem_limit }}
+  persistence:
+    storageClassName: {{ rabbitmq_vol_storageclass }}
+    storage: {{ rabbitmq_vol_size_g }}Gi
diff --git a/roles/infrastructure/templates/service-rabbitmq.yaml.j2 b/roles/infrastructure/templates/service-rabbitmq.yaml.j2
deleted file mode 100644
index 140a134..0000000
--- a/roles/infrastructure/templates/service-rabbitmq.yaml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: rabbitmq
-  namespace: {{ infra_namespace }}
-spec:
-  selector:
-    name: rabbitmq
-  ports:
-  - name: empd
-    port: 4369
-    targetPort: empd
-  - name: stream
-    port: 5552
-    targetPort: stream
-  - name: ampq
-    port: 5672
-    targetPort: ampq
-  - name: http
-    port: 15672
-    targetPort: http
-  - name: erlang
-    port: 25672
-    targetPort: erlang
diff --git a/roles/infrastructure/templates/statefulset-rabbitmq.yaml.j2 b/roles/infrastructure/templates/statefulset-rabbitmq.yaml.j2
deleted file mode 100644
index f99fcf1..0000000
--- a/roles/infrastructure/templates/statefulset-rabbitmq.yaml.j2
+++ /dev/null
@@ -1,146 +0,0 @@
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: rabbitmq
-  namespace: {{ infra_namespace }}
-spec:
-  selector:
-    matchLabels:
-      name: rabbitmq
-  template:
-    metadata:
-      name: rabbitmq
-      labels:
-        name: rabbitmq
-    spec:
-{% if infra_priority_class %}
-      priorityClassName: {{ infra_priority_class }}
-{% endif %}
-      serviceAccountName: {{ infra_namespace_service_account }}
-
-      # We must have a 'core' node
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: informaticsmatters.com/purpose-core
-                operator: Exists
-
-      securityContext:
-        fsGroup: 100
-        runAsUser: 100
-        runAsGroup: 100
-
-  {% if all_image_preset_pullsecret_name|string|length > 0 %}
-      imagePullSecrets:
-      - name: {{ all_image_preset_pullsecret_name }}
-  {% endif %}
-
-      # See https://stackoverflow.com/questions/68179365
-      #
-      # for a discussion of trying to overcome RabbitMQ's problems with a node name
-      # that  is not 'localhost'. The hostname is the pod name
-      # (rabbitmq-0 for the first stateful set) so we set it explicitly,
-      # and then hostAliases to add entries to the /etc/hosts file so we can
-      # resolve the node name we are going to give the Pod.
-      #
-      # We have to set RABBITMQ_NODENAME
-      # and we also appear to have to set RABBITMQ_USE_LONGNAME
-      hostname: rabbit
-      hostAliases:
-      - ip: "127.0.0.1"
-        hostnames:
-        - rabbitmq
-        - rabbitmq.{{ infra_namespace }}.svc.cluster.local
-
-      containers:
-      - name: rabbitmq
-        image: {{ rabbitmq_registry }}{{ rabbitmq_image }}:{{ rabbitmq_version }}
-        imagePullPolicy: IfNotPresent
-        terminationMessagePolicy: FallbackToLogsOnError
-        env:
-        - name: RABBITMQ_NODENAME
-          value: 'rabbit@rabbitmq.{{ infra_namespace }}.svc.cluster.local'
-        - name: RABBITMQ_USE_LONGNAME
-          value: 'true'
-        - name: RABBITMQ_DEFAULT_USER
-          valueFrom:
-            secretKeyRef:
-              name: im-rabbitmq
-              key: user
-        - name: RABBITMQ_DEFAULT_PASS
-          valueFrom:
-            secretKeyRef:
-              name: im-rabbitmq
-              key: password
-        ports:
-        - name: empd
-          containerPort: 4369
-        - name: stream
-          containerPort: 5552
-        - name: ampq
-          containerPort: 5672
-        - name: http
-          containerPort: 15672
-        - name: erlang
-          containerPort: 25672
-        readinessProbe:
-          exec:
-            command:
-            - rabbitmq-diagnostics
-            - -q
-            - check_running
-          initialDelaySeconds: 60
-          periodSeconds: 20
-          timeoutSeconds: 10
-          failureThreshold: 10
-        livenessProbe:
-          exec:
-            command:
-            - rabbitmq-diagnostics
-            - -q
-            - check_port_connectivity
-          initialDelaySeconds: 90
-          periodSeconds: 20
-          timeoutSeconds: 10
-          failureThreshold: 5
-        volumeMounts:
-        - mountPath: /etc/rabbitmq/rabbitmq.conf
-          subPath: rabbitmq.conf
-          name: rabbitmq-conf
-        - mountPath: /etc/rabbitmq/enabled_plugins
-          subPath: enabled_plugins
-          name: rabbitmq-plugins
-        - mountPath: /var/lib/rabbitmq/mnesia
-          name: rabbitmq-data
-        - mountPath: /var/log/rabbitmq
-          name: rabbitmq-log
-        resources:
-          requests:
-            cpu: {{ rabbitmq_cpu_request }}
-            memory: {{ rabbitmq_mem_request }}
-{% if rabbitmq_cpu_limit or rabbitmq_mem_limit %}
-          limits:
-{% if rabbitmq_cpu_limit %}
-            cpu: {{ rabbitmq_cpu_limit }}
-{% endif %}
-{% if rabbitmq_mem_limit %}
-            memory: {{ rabbitmq_mem_limit }}
-{% endif %}
-{% endif %}
-
-      volumes:
-      - name: rabbitmq-conf
-        configMap:
-          name: rabbitmq-conf
-      - name: rabbitmq-plugins
-        configMap:
-          name: rabbitmq-plugins
-      - name: rabbitmq-data
-        persistentVolumeClaim:
-          claimName: rabbitmq-data
-      - name: rabbitmq-log
-        persistentVolumeClaim:
-          claimName: rabbitmq-log
diff --git a/roles/infrastructure/vars/main.yaml b/roles/infrastructure/vars/main.yaml
index 87a3e51..d98cdf2 100644
--- a/roles/infrastructure/vars/main.yaml
+++ b/roles/infrastructure/vars/main.yaml
@@ -81,13 +81,6 @@ kc_mem_limit: 1Gi
 
 # RabbitMQ --------------------------------------------------------------------
 
-# The RabbitMQ image, version and image registry
-rabbitmq_image: rabbitmq
-rabbitmq_version: 3.12.14-management-alpine
-rabbitmq_registry: ""
-
-rabbitmq_erlang_cookie: "{{ lookup('password', '/dev/null length=80 chars=ascii_letters') }}"
-
 # CPU and Memory requests and limits
 rabbitmq_cpu_request: 4
 rabbitmq_cpu_limit: 4

From fc88fa007e4c3bb3cc1bcdb25c88a7f5052e3b2d Mon Sep 17 00:00:00 2001
From: "a.b.christie" <alan.christie@matildapeak.com>
Date: Fri, 12 Dec 2025 15:36:23 +0000
Subject: [PATCH 2/6] ci: Adjust keycloak/rabbitmq requests/limits

---
 roles/infrastructure/vars/main.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/infrastructure/vars/main.yaml b/roles/infrastructure/vars/main.yaml
index d98cdf2..33fef54 100644
--- a/roles/infrastructure/vars/main.yaml
+++ b/roles/infrastructure/vars/main.yaml
@@ -74,15 +74,15 @@ kc_image_registry: docker.io
 kc_db_password: "{{ lookup('password', '/dev/null length=10 chars=ascii_letters') }}"
 
 # CPU and Memory requests and limits
-kc_cpu_request: 250m
+kc_cpu_request: 100m
 kc_cpu_limit: 2
-kc_mem_request: 1Gi
+kc_mem_request: 500Mi
 kc_mem_limit: 1Gi
 
 # RabbitMQ --------------------------------------------------------------------
 
 # CPU and Memory requests and limits
-rabbitmq_cpu_request: 4
+rabbitmq_cpu_request: 200m
 rabbitmq_cpu_limit: 4
-rabbitmq_mem_request: 500Mi
+rabbitmq_mem_request: 300Mi
 rabbitmq_mem_limit: 0

From ae2ce25792792e56bf85dc64cbe6ab9219dec8aa Mon Sep 17 00:00:00 2001
From: "a.b.christie" <alan.christie@matildapeak.com>
Date: Mon, 15 Dec 2025 15:57:25 +0000
Subject: [PATCH 3/6] feat: Add priority, better resources and rabbitmq version

---
 roles/infrastructure/defaults/main.yaml       |  6 ++++-
 .../templates/rabbitmqcluster.yaml.j2         | 24 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/roles/infrastructure/defaults/main.yaml b/roles/infrastructure/defaults/main.yaml
index 1a6b700..42fd750 100644
--- a/roles/infrastructure/defaults/main.yaml
+++ b/roles/infrastructure/defaults/main.yaml
@@ -109,6 +109,10 @@ kc_admin_password: "{{ lookup('password', '/dev/null length=12 chars=ascii_lette
 # the Keycloak DB is (at the moment) part of the core database installation.
 rabbitmq_state: present
 
+# The RabbitMQ management server version to deploy,
+# the version will have '-management' automatically applied as a postfix.
+rabbitmq_version: 4.2.1
+
 # The hostname of the server that will host Keycloak,
 # devoid of the protocol (i.e. 'https://' assumed so just 'example.com').
 # If not set (blank) no ingress is created.
@@ -122,7 +126,7 @@ rabbitmq_cert_issuer: production
 rabbitmq_user: admin
 rabbitmq_user_password: "{{ lookup('password', '/dev/null length=12 chars=ascii_letters') }}"
 
-rabbitmq_replicas: 1
+rabbitmq_replicas: 2
 
 rabbitmq_vol_storageclass: " "
 rabbitmq_vol_size_g: 1
diff --git a/roles/infrastructure/templates/rabbitmqcluster.yaml.j2 b/roles/infrastructure/templates/rabbitmqcluster.yaml.j2
index 6176717..b1b2a47 100644
--- a/roles/infrastructure/templates/rabbitmqcluster.yaml.j2
+++ b/roles/infrastructure/templates/rabbitmqcluster.yaml.j2
@@ -2,9 +2,12 @@
 apiVersion: rabbitmq.com/v1beta1
 kind: RabbitmqCluster
 metadata:
-  name: {{ infra_namespace }}
+  # The instance name can be called pretty-much anything...
+  # except rabbitmq!?
+  name: rabbit
   namespace: {{ infra_namespace }}
 spec:
+  image: rabbitmq:{{ rabbitmq_version }}-management
   replicas: {{ rabbitmq_replicas }}
   rabbitmq:
     additionalPlugins:
@@ -14,12 +17,31 @@ spec:
     - rabbitmq_stream
     - rabbitmq_stream_management
   resources:
+{% if rabbitmq_cpu_request or rabbitmq_mem_request %}
     requests:
+{% if rabbitmq_cpu_request %}
       cpu: {{ rabbitmq_cpu_request }}
+{% endif %}
+{% if rabbitmq_mem_request %}
       memory: {{ rabbitmq_mem_request }}
+{% endif %}
+{% endif %}
+{% if rabbitmq_cpu_limit or rabbitmq_mem_limit %}
     limits:
+{% if rabbitmq_cpu_limit %}
       cpu: {{ rabbitmq_cpu_limit }}
+{% endif %}
+{% if rabbitmq_mem_limit %}
       memory: {{ rabbitmq_mem_limit }}
+{% endif %}
+{% endif %}
   persistence:
     storageClassName: {{ rabbitmq_vol_storageclass }}
     storage: {{ rabbitmq_vol_size_g }}Gi
+  override:
+    statefulSet:
+      spec:
+        template:
+          spec:
+            containers: []
+            priorityClassName: im-application-high

From 6169beac15232f82b8d92017831132a7f1886825 Mon Sep 17 00:00:00 2001
From: "a.b.christie" <alan.christie@matildapeak.com>
Date: Mon, 15 Dec 2025 16:02:32 +0000
Subject: [PATCH 4/6] feat: Fixed deploy-rabbitmq

---
 roles/infrastructure/tasks/deploy-rabbitmq.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/infrastructure/tasks/deploy-rabbitmq.yaml b/roles/infrastructure/tasks/deploy-rabbitmq.yaml
index 980935b..94c6504 100644
--- a/roles/infrastructure/tasks/deploy-rabbitmq.yaml
+++ b/roles/infrastructure/tasks/deploy-rabbitmq.yaml
@@ -37,11 +37,11 @@
   - name: Wait for RabbitMQ to become Ready ({{ wait_timeout }} seconds)
     kubernetes.core.k8s_info:
       kind: Pod
-      name: "{{ infra_namespace }}-server-0"
+      name: rabbit-server-0
       namespace: "{{ infra_namespace }}"
     register: rabbitmq_result
     until: >-
-      rabbitmq_result.resources | length == 1
+      rabbitmq_result.resources | length > 0
       and rabbitmq_result.resources[0].status is defined
       and rabbitmq_result.resources[0].status.containerStatuses is defined
       and rabbitmq_result.resources[0].status.containerStatuses | length > 0

From 0bb86b83a6e4e969c3e2218bd72e200c2e5620fa Mon Sep 17 00:00:00 2001
From: "a.b.christie" <alan.christie@matildapeak.com>
Date: Mon, 15 Dec 2025 16:03:09 +0000
Subject: [PATCH 5/6] fix: Fixed Ingress for latest RabbitMQ deployment

---
 roles/infrastructure/templates/ingress-rabbitmq.yaml.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/infrastructure/templates/ingress-rabbitmq.yaml.j2 b/roles/infrastructure/templates/ingress-rabbitmq.yaml.j2
index c0a0421..32d0012 100644
--- a/roles/infrastructure/templates/ingress-rabbitmq.yaml.j2
+++ b/roles/infrastructure/templates/ingress-rabbitmq.yaml.j2
@@ -20,6 +20,6 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: rabbitmq
+            name: rabbit
             port:
-              name: http
+              name: management

From 0ef412e980c890f93a134b2d51cbb09dbcbb71b2 Mon Sep 17 00:00:00 2001
From: "a.b.christie" <alan.christie@matildapeak.com>
Date: Mon, 15 Dec 2025 16:58:27 +0000
Subject: [PATCH 6/6] ci: Attempot to fix build

---
 .yamllint | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.yamllint b/.yamllint
index 4ae34bb..1beb178 100644
--- a/.yamllint
+++ b/.yamllint
@@ -40,11 +40,9 @@ ignore: |
   roles/infrastructure/templates/cronjob-postgres-backup-weekly.yaml.j2
   roles/infrastructure/templates/pvc-postgres.yaml.j2
   roles/infrastructure/templates/pvc-postgres-backup.yaml.j2
-  roles/infrastructure/templates/pvc-rabbitmq-data.yaml.j2
-  roles/infrastructure/templates/pvc-rabbitmq-log.yaml.j2
   roles/infrastructure/templates/serviceaccount-im-infra.yaml.j2
   roles/infrastructure/templates/statefulset-keycloak.yaml.j2
   roles/infrastructure/templates/statefulset-postgres.yaml.j2
-  roles/infrastructure/templates/statefulset-rabbitmq.yaml.j2
+  roles/infrastructure/templates/rabbitmqcluster.yaml.j2
   roles/infrastructure/templates/ingress-keycloak.yaml.j2
   provisioning/ingress-controller/ingress-nginx-2.9.1.yaml