diff --git a/clusters/cl01tl/manifests/rook-ceph/CephCluster-rook-ceph.yaml b/clusters/cl01tl/manifests/rook-ceph/CephCluster-rook-ceph.yaml index afb688e37..dc855b207 100644 --- a/clusters/cl01tl/manifests/rook-ceph/CephCluster-rook-ceph.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/CephCluster-rook-ceph.yaml @@ -7,9 +7,8 @@ spec: monitoring: enabled: true cephVersion: - image: "quay.io/ceph/ceph:v19.2.3-20250717" + image: "quay.io/ceph/ceph:v20.2.1@sha256:0bae386bc859cd9a05b804d1ca16cca8853a64f90809044e2bf43095419dc337" allowUnsupported: false - imagePullPolicy: IfNotPresent cephConfig: osd: bluestore_slow_ops_warn_lifetime: "60" @@ -105,57 +104,49 @@ spec: removeOSDsIfOutAndSafeToRemove: false resources: cleanup: - limits: - memory: 1Gi + limits: {} requests: - cpu: 500m + cpu: 10m memory: 100Mi crashcollector: - limits: - memory: 60Mi + limits: {} requests: - cpu: 100m - memory: 60Mi + cpu: 10m + memory: 20Mi exporter: - limits: - memory: 128Mi + limits: {} requests: - cpu: 50m - memory: 50Mi + cpu: 10m + memory: 20Mi logcollector: - limits: - memory: 1Gi + limits: {} requests: - cpu: 100m + cpu: 10m memory: 100Mi mgr: - limits: - memory: 1Gi + limits: {} requests: cpu: 100m - memory: 512Mi + memory: 500Mi mgr-sidecar: - limits: - memory: 100Mi + limits: {} requests: cpu: 100m memory: 40Mi mon: - limits: - memory: 2Gi + limits: {} requests: - cpu: 200m - memory: 256Mi + cpu: 100m + memory: 750Mi osd: - limits: - memory: 4Gi + limits: {} requests: cpu: 100m memory: 2Gi prepareosd: requests: cpu: 100m - memory: 128Mi + memory: 200Mi skipUpgradeChecks: false storage: config: diff --git a/clusters/cl01tl/manifests/rook-ceph/CephFilesystem-ceph-filesystem.yaml b/clusters/cl01tl/manifests/rook-ceph/CephFilesystem-ceph-filesystem.yaml index db3b12e99..d39542920 100644 --- a/clusters/cl01tl/manifests/rook-ceph/CephFilesystem-ceph-filesystem.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/CephFilesystem-ceph-filesystem.yaml @@ -17,6 +17,8 @@ spec: activeStandby: true priorityClassName: system-cluster-critical resources: - requests: - cpu: 1000m + limits: memory: 4Gi + requests: + cpu: 100m + memory: 400Mi diff --git a/clusters/cl01tl/manifests/rook-ceph/ConfigMap-rook-ceph-operator-config.yaml b/clusters/cl01tl/manifests/rook-ceph/ConfigMap-rook-ceph-operator-config.yaml index 7fc007d02..c40890551 100644 --- a/clusters/cl01tl/manifests/rook-ceph/ConfigMap-rook-ceph-operator-config.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/ConfigMap-rook-ceph-operator-config.yaml @@ -53,7 +53,7 @@ data: ROOK_CSI_ENABLE_NFS: "false" CSI_FORCE_CEPHFS_KERNEL_CLIENT: "true" CSI_GRPC_TIMEOUT_SECONDS: "150" - CSI_PROVISIONER_REPLICAS: "3" + CSI_PROVISIONER_REPLICAS: "2" CSI_RBD_PROVISIONER_RESOURCE: "- name : csi-provisioner\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-resizer\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-attacher\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-snapshotter\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-rbdplugin\n resource:\n requests:\n memory: 512Mi\n limits:\n memory: 1Gi\n- name : csi-omap-generator\n resource:\n requests:\n memory: 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n- name : liveness-prometheus\n resource:\n requests:\n memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n" CSI_RBD_PLUGIN_RESOURCE: "- name : driver-registrar\n resource:\n requests:\n memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n- name : csi-rbdplugin\n resource:\n requests:\n memory: 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n- name : liveness-prometheus\n resource:\n requests:\n memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n" CSI_CEPHFS_PROVISIONER_RESOURCE: "- name : csi-provisioner\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-resizer\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-attacher\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-snapshotter\n resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n- name : csi-cephfsplugin\n resource:\n requests:\n memory: 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n- name : liveness-prometheus\n resource:\n requests:\n memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n" diff --git a/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-operator.yaml b/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-operator.yaml index ee0175982..f1f5f7898 100644 --- a/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-operator.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-operator.yaml @@ -72,11 +72,10 @@ spec: fieldRef: fieldPath: metadata.namespace resources: - limits: - memory: 512Mi + limits: {} requests: - cpu: 200m - memory: 128Mi + cpu: 100m + memory: 100Mi serviceAccountName: rook-ceph-system volumes: - name: rook-config diff --git a/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml b/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml index ce31191db..fe65d9a5b 100644 --- a/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml +++ b/clusters/cl01tl/manifests/rook-ceph/Deployment-rook-ceph-tools.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools - image: quay.io/ceph/ceph:v19.2.3-20250717 + image: quay.io/ceph/ceph:v20.2.1@sha256:0bae386bc859cd9a05b804d1ca16cca8853a64f90809044e2bf43095419dc337 command: - /bin/bash - -c @@ -109,11 +109,10 @@ spec: name: rook-ceph-mon key: ceph-username resources: - limits: - memory: 1Gi + limits: {} requests: - cpu: 100m - memory: 128Mi + cpu: 1m + memory: 10Mi volumeMounts: - mountPath: /etc/ceph name: ceph-config