From 646170c84a41215fd05defda00eaa1faa933ab17 Mon Sep 17 00:00:00 2001
From: Luca Miccini <lmiccini@users.noreply.github.com>
Date: Tue, 31 Mar 2026 08:28:38 +0200
Subject: [PATCH] Revert "Increase rabbitmq pods memory limits"

---
 .../control-plane/scaledown/service-values.yaml    |  7 -------
 examples/dt/dcn/service-values.yaml                | 14 --------------
 .../control-plane/service-values.yaml              |  7 -------
 .../uni05epsilon/control-plane/service-values.yaml |  7 -------
 examples/dt/uni05epsilon/service-values.yaml       | 14 --------------
 examples/va/hci/service-values.yaml                |  7 -------
 lib/control-plane/base/openstackcontrolplane.yaml  | 14 --------------
 7 files changed, 70 deletions(-)

diff --git a/examples/dt/dcn/control-plane/scaledown/service-values.yaml b/examples/dt/dcn/control-plane/scaledown/service-values.yaml
index 50141e376..8d8f8f275 100644
--- a/examples/dt/dcn/control-plane/scaledown/service-values.yaml
+++ b/examples/dt/dcn/control-plane/scaledown/service-values.yaml
@@ -327,13 +327,6 @@ data:
             spec:
               type: LoadBalancer
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
   extraMounts:
     - name: v1
       region: r1
diff --git a/examples/dt/dcn/service-values.yaml b/examples/dt/dcn/service-values.yaml
index 9a6f371f9..b982d8da1 100644
--- a/examples/dt/dcn/service-values.yaml
+++ b/examples/dt/dcn/service-values.yaml
@@ -408,13 +408,6 @@ data:
             spec:
               type: LoadBalancer
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
       rabbitmq-cell3:
         override:
           service:
@@ -425,13 +418,6 @@ data:
             spec:
               type: LoadBalancer
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
   extraMounts:
     - name: v1
       region: r1
diff --git a/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml b/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml
index f63399c11..605081325 100644
--- a/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml
+++ b/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml
@@ -65,10 +65,3 @@ data:
     templates:
       rabbitmq-cell2:
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
diff --git a/examples/dt/uni05epsilon/control-plane/service-values.yaml b/examples/dt/uni05epsilon/control-plane/service-values.yaml
index db32fa5d0..14fc7f872 100644
--- a/examples/dt/uni05epsilon/control-plane/service-values.yaml
+++ b/examples/dt/uni05epsilon/control-plane/service-values.yaml
@@ -39,10 +39,3 @@ data:
     templates:
       rabbitmq-cell2:
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
diff --git a/examples/dt/uni05epsilon/service-values.yaml b/examples/dt/uni05epsilon/service-values.yaml
index 38df72ac4..157a46b6c 100644
--- a/examples/dt/uni05epsilon/service-values.yaml
+++ b/examples/dt/uni05epsilon/service-values.yaml
@@ -152,13 +152,6 @@ data:
     templates:
       rabbitmq-cell2:
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
       rabbitmq-notifications:
         override:
           service:
@@ -169,13 +162,6 @@ data:
             spec:
               type: LoadBalancer
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
 
   swift:
     enabled: true
diff --git a/examples/va/hci/service-values.yaml b/examples/va/hci/service-values.yaml
index 58bf98651..802dbb127 100644
--- a/examples/va/hci/service-values.yaml
+++ b/examples/va/hci/service-values.yaml
@@ -141,12 +141,5 @@ data:
             spec:
               type: LoadBalancer
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
   watcher:
     enabled: true
diff --git a/lib/control-plane/base/openstackcontrolplane.yaml b/lib/control-plane/base/openstackcontrolplane.yaml
index e92eff11a..08f3a0256 100644
--- a/lib/control-plane/base/openstackcontrolplane.yaml
+++ b/lib/control-plane/base/openstackcontrolplane.yaml
@@ -249,22 +249,8 @@ spec:
     templates:
       rabbitmq:
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
       rabbitmq-cell1:
         replicas: 3
-        resources:
-          limits:
-            cpu: "2"
-            memory: 4Gi
-          requests:
-            cpu: "1"
-            memory: 4Gi
   notificationsBus:
     cluster: rabbitmq
   secret: osp-secret