[ocp4_workload_external_odf] Update noobaa resources (#8838)

* Update storagecluster.yaml.j2 * Update workload.yml * Update workload.yml * Update storagecluster.yaml.j2 * Update main.yml * Update storagecluster.yaml.j2 * Update workload.yml * Update workload.yml * Update workload.yml * Update workload.yml
redhat-cop · Nov 21, 2024 · 4846645 · 4846645
1 parent 086d6b0
commit 4846645
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_external_odf/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_external_odf/defaults/main.yml
@@ -5,3 +5,14 @@ odf_channel: stable-4.16
 ocp4_workload_external_odf_registry_size: 100Gi
 ocp4_workload_external_odf_storage_cluster_deploy_retries: 60
 ocp4_workload_external_odf_backingstore_pv_volumes: 3
+ocp4_workload_external_odf_backingstore_custom_resources: false
+ocp4_workload_external_odf_backingstore_cpu_limits: 1000m
+ocp4_workload_external_odf_backingstore_cpu_requests: 800m
+ocp4_workload_external_odf_backingstore_memory_limits: 4000Mi
+ocp4_workload_external_odf_backingstore_memory_requests: 800Mi
+ocp4_workload_external_odf_backingstore_storage_requests: 50Gi
+ocp4_workload_external_odf_noobaa_custom_resources: false
+ocp4_workload_external_odf_noobaa_memory_limits: 4Gi
+ocp4_workload_external_odf_noobaa_memory_requests: 4Gi
+ocp4_workload_external_odf_noobaa_cpu_limits: 3
+ocp4_workload_external_odf_noobaa_cpu_requests: 3
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_external_odf/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_external_odf/tasks/workload.yml
@@ -139,3 +139,23 @@
         spec:
           pvPool:
             numVolumes: "{{ ocp4_workload_external_odf_backingstore_pv_volumes }}"
+
+  - name: Change default BackingStore resources
+    when: ocp4_workload_external_odf_backingstore_custom_resources | default(false)
+    kubernetes.core.k8s:
+      state: patched
+      api_version: noobaa.io/v1alpha1
+      kind: BackingStore
+      name: noobaa-default-backing-store
+      namespace: openshift-storage
+      definition:
+        spec:
+          pvPool:
+            resources:
+              limits:
+                cpu: "{{ ocp4_workload_external_odf_backingstore_cpu_limits }}"
+                memory: "{{ ocp4_workload_external_odf_backingstore_memory_limits }}"
+              requests:
+                cpu: "{{ ocp4_workload_external_odf_backingstore_cpu_requests }}"
+                memory: "{{ ocp4_workload_external_odf_backingstore_memory_requests }}"
+                storage: "{{ ocp4_workload_external_odf_backingstore_storage_requests }}"
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_external_odf/templates/storagecluster.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_external_odf/templates/storagecluster.yaml.j2
@@ -9,6 +9,30 @@ spec:
   externalStorage:
     enable: true
   labelSelector: {}
+{% if ocp4_workload_external_odf_noobaa_custom_resources | default(false) %}
+  resources:
+    noobaa-core:
+      limits:
+        cpu: "{{ ocp4_workload_external_odf_noobaa_cpu_limits }}"
+        memory: "{{ ocp4_workload_external_odf_noobaa_memory_limits }}"
+      requests:
+        cpu: "{{ ocp4_workload_external_odf_noobaa_cpu_requests }}"
+        memory: "{{ ocp4_workload_external_odf_noobaa_memory_requests }}"
+    noobaa-db:
+      limits:
+        cpu: "{{ ocp4_workload_external_odf_noobaa_cpu_limits }}"
+        memory: "{{ ocp4_workload_external_odf_noobaa_memory_limits }}"
+      requests:
+        cpu: "{{ ocp4_workload_external_odf_noobaa_cpu_requests }}"
+        memory: "{{ ocp4_workload_external_odf_noobaa_memory_requests }}"
+    noobaa-endpoint:
+      limits:
+        cpu: "{{ ocp4_workload_external_odf_noobaa_cpu_limits }}"
+        memory: "{{ ocp4_workload_external_odf_noobaa_memory_limits }}"
+      requests:
+        cpu: "{{ ocp4_workload_external_odf_noobaa_cpu_requests }}"
+        memory: "{{ ocp4_workload_external_odf_noobaa_memory_requests }}"
+{% endif %}
   managedResources:
     cephBlockPools:
       disableStorageClass: true