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

update schema with default values #3068

Merged
merged 2 commits into from
Apr 7, 2022
Merged

update schema with default values #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8354788
rook/ceph
cicharka Apr 5, 2022
43b1136
Merge branch 'feature/rook-ceph-storage' into feature/rook-ceph-storage
cicharka Apr 7, 2022
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
7 changes: 0 additions & 7 deletions ansible/playbooks/roles/rook/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
- "{{ rook_helm_chart_file_name }}"
- "{{ rook_helm_cluster_chart_file_name }}"

- name: Fail when configuration for operator and cluster chart are not defined
fail:
msg: "You need to configure operator_chart_values and cluster_chart_values when rook is enabled"
when:
- specification.operator_chart_values is not defined or
specification.cluster_chart_values is not defined

- name: Create configuration for operator Helm chart file (operator-custom-chart-values.yml)
copy:
content: "{{ specification.operator_chart_values }}"
Expand Down
231 changes: 4 additions & 227 deletions schema/common/defaults/configuration/rook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ specification:
rook_namespace: rook-ceph
enabled: false
operator_chart_values:
image:
repository: rook/ceph
tag: VERSION
pullPolicy: IfNotPresent
crds:
enabled: true
resources:
Expand Down Expand Up @@ -39,146 +35,6 @@ specification:
enableOMAPGenerator: false
provisionerReplicas: 2
allowUnsupportedVersion: false
csiRBDProvisionerResource: |
- name : csi-provisioner
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-resizer
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-attacher
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-snapshotter
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-rbdplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
csiRBDPluginResource: |
- name : driver-registrar
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
- name : csi-rbdplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
csiCephFSProvisionerResource: |
- name : csi-provisioner
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-resizer
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-attacher
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-cephfsplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
csiCephFSPluginResource: |
- name : driver-registrar
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
- name : csi-cephfsplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
forceCephFSKernelClient: true
volumeReplication:
enabled: false
Expand All @@ -198,19 +54,12 @@ specification:
operatorNamespace: rook-ceph
toolbox:
enabled: false
image: rook/ceph:VERSION
image: rook/ceph:v1.8.8
tolerations: []
affinity: {}
resources:
limits:
cpu: "500m"
memory: "1Gi"
requests:
cpu: "100m"
memory: "128Mi"
resources: {}
monitoring:
enabled: false
createPrometheusRules: false
rulesNamespaceOverride:
pspEnable: true
cephClusterSpec:
Expand All @@ -225,8 +74,7 @@ specification:
count: 3
allowMultiplePerNode: false
mgr:
count: 2
allowMultiplePerNode: false
count: 1
modules:
- name: pg_autoscaler
enabled: true
Expand All @@ -242,65 +90,8 @@ specification:
dataSource: zero
iteration: 1
allowUninstallWithVolumes: false
resources:
mgr:
limits:
cpu: "1000m"
memory: "1Gi"
requests:
cpu: "500m"
memory: "512Mi"
mon:
limits:
cpu: "2000m"
memory: "2Gi"
requests:
cpu: "1000m"
memory: "1Gi"
osd:
limits:
cpu: "2000m"
memory: "4Gi"
requests:
cpu: "1000m"
memory: "4Gi"
prepareosd:
limits:
cpu: "500m"
memory: "200Mi"
requests:
cpu: "500m"
memory: "50Mi"
mgr-sidecar:
limits:
cpu: "500m"
memory: "100Mi"
requests:
cpu: "100m"
memory: "40Mi"
crashcollector:
limits:
cpu: "500m"
memory: "60Mi"
requests:
cpu: "100m"
memory: "60Mi"
logcollector:
limits:
cpu: "500m"
memory: "1Gi"
requests:
cpu: "100m"
memory: "100Mi"
cleanup:
limits:
cpu: "500m"
memory: "1Gi"
requests:
cpu: "500m"
memory: "100Mi"
removeOSDsIfOutAndSafeToRemove: false
storage: # cluster level storage configuration and selection
storage:
useAllNodes: true
useAllDevices: true
disruptionManagement:
Expand Down Expand Up @@ -366,13 +157,6 @@ specification:
metadataServer:
activeCount: 1
activeStandby: true
resources:
limits:
cpu: "2000m"
memory: "4Gi"
requests:
cpu: "1000m"
memory: "4Gi"
storageClass:
enabled: true
isDefault: false
Expand Down Expand Up @@ -420,13 +204,6 @@ specification:
preservePoolsOnDelete: true
gateway:
port: 80
resources:
limits:
cpu: "2000m"
memory: "2Gi"
requests:
cpu: "1000m"
memory: "1Gi"
instances: 1
healthCheck:
bucket:
Expand Down