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/examples/va/multi-namespace-skmo/control-plane/kustomization.yaml b/examples/va/multi-namespace-skmo/control-plane/kustomization.yaml index ad898010a..f7f86baf0 100644 --- a/examples/va/multi-namespace-skmo/control-plane/kustomization.yaml +++ b/examples/va/multi-namespace-skmo/control-plane/kustomization.yaml @@ -10,24 +10,6 @@ patches: kind: ConfigMap name: service-values path: service-values.yaml - - target: - group: core.openstack.org - version: v1beta1 - kind: OpenStackControlPlane - name: controlplane - patch: |- - - op: replace - path: /spec/rabbitmq/templates/rabbitmq/resources/requests/memory - value: 2Gi - - op: replace - path: /spec/rabbitmq/templates/rabbitmq/resources/limits/memory - value: 2Gi - - op: replace - path: /spec/rabbitmq/templates/rabbitmq-cell1/resources/requests/memory - value: 2Gi - - op: replace - path: /spec/rabbitmq/templates/rabbitmq-cell1/resources/limits/memory - value: 2Gi replacements: - source: diff --git a/examples/va/multi-namespace-skmo/control-plane2/kustomization.yaml b/examples/va/multi-namespace-skmo/control-plane2/kustomization.yaml index a0ff31349..7a569c2b1 100644 --- a/examples/va/multi-namespace-skmo/control-plane2/kustomization.yaml +++ b/examples/va/multi-namespace-skmo/control-plane2/kustomization.yaml @@ -23,18 +23,6 @@ patches: path: /spec/keystone/template/override/service/internal/metadata - op: remove path: /spec/keystone/template/override/service/internal/spec - - op: replace - path: /spec/rabbitmq/templates/rabbitmq/resources/requests/memory - value: 2Gi - - op: replace - path: /spec/rabbitmq/templates/rabbitmq/resources/limits/memory - value: 2Gi - - op: replace - path: /spec/rabbitmq/templates/rabbitmq-cell1/resources/requests/memory - value: 2Gi - - op: replace - path: /spec/rabbitmq/templates/rabbitmq-cell1/resources/limits/memory - value: 2Gi replacements: - source: 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