From 6d48dab02b899bead78c9c0c66a9085809beaf3f Mon Sep 17 00:00:00 2001 From: cicharka <93913624+cicharka@users.noreply.github.com> Date: Thu, 7 Apr 2022 17:41:30 +0200 Subject: [PATCH] rook/ceph (#3068) * add default values in epiphany configuration * bump up verison of rook --- ansible/playbooks/roles/rook/tasks/main.yml | 7 - schema/common/defaults/configuration/rook.yml | 231 +----------------- 2 files changed, 4 insertions(+), 234 deletions(-) diff --git a/ansible/playbooks/roles/rook/tasks/main.yml b/ansible/playbooks/roles/rook/tasks/main.yml index 8ef3e7319a..0a74498fa7 100644 --- a/ansible/playbooks/roles/rook/tasks/main.yml +++ b/ansible/playbooks/roles/rook/tasks/main.yml @@ -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 }}" diff --git a/schema/common/defaults/configuration/rook.yml b/schema/common/defaults/configuration/rook.yml index 7a322cf70e..d41401bbec 100644 --- a/schema/common/defaults/configuration/rook.yml +++ b/schema/common/defaults/configuration/rook.yml @@ -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: @@ -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 @@ -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: @@ -225,8 +74,7 @@ specification: count: 3 allowMultiplePerNode: false mgr: - count: 2 - allowMultiplePerNode: false + count: 1 modules: - name: pg_autoscaler enabled: true @@ -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: @@ -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 @@ -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: