Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ocp4_workload_external_odf] Update noobaa resources #8838

Merged
merged 10 commits into from
Nov 18, 2024
Merged

[ocp4_workload_external_odf] Update noobaa resources #8838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2908408
Update storagecluster.yaml.j2
agonzalezrh Nov 18, 2024
8d66280
Update workload.yml
agonzalezrh Nov 18, 2024
680927c
Update workload.yml
agonzalezrh Nov 18, 2024
149c4f0
Update storagecluster.yaml.j2
agonzalezrh Nov 18, 2024
2d6bcfe
Update main.yml
agonzalezrh Nov 18, 2024
a5513c3
Update storagecluster.yaml.j2
agonzalezrh Nov 18, 2024
421efdb
Update workload.yml
agonzalezrh Nov 18, 2024
2200d92
Update workload.yml
agonzalezrh Nov 18, 2024
0225821
Update workload.yml
agonzalezrh Nov 18, 2024
e12cf5d
Update workload.yml
agonzalezrh Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ansible/roles_ocp_workloads/ocp4_workload_external_odf/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 20 additions & 0 deletions ansible/roles_ocp_workloads/ocp4_workload_external_odf/tasks/workload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
24 changes: 24 additions & 0 deletions ansible/roles_ocp_workloads/ocp4_workload_external_odf/templates/storagecluster.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading