Merge pull request 'Automated Manifest Update' (#5619) from auto/update-manifests into manifests

Reviewed-on: #5619
This commit was merged in pull request #5619.
This commit is contained in:
2026-04-06 22:05:51 +00:00
5 changed files with 31 additions and 40 deletions

View File

@@ -7,9 +7,8 @@ spec:
monitoring: monitoring:
enabled: true enabled: true
cephVersion: cephVersion:
image: "quay.io/ceph/ceph:v19.2.3-20250717" image: "quay.io/ceph/ceph:v20.2.1@sha256:0bae386bc859cd9a05b804d1ca16cca8853a64f90809044e2bf43095419dc337"
allowUnsupported: false allowUnsupported: false
imagePullPolicy: IfNotPresent
cephConfig: cephConfig:
osd: osd:
bluestore_slow_ops_warn_lifetime: "60" bluestore_slow_ops_warn_lifetime: "60"
@@ -105,57 +104,49 @@ spec:
removeOSDsIfOutAndSafeToRemove: false removeOSDsIfOutAndSafeToRemove: false
resources: resources:
cleanup: cleanup:
limits: limits: {}
memory: 1Gi
requests: requests:
cpu: 500m cpu: 10m
memory: 100Mi memory: 100Mi
crashcollector: crashcollector:
limits: limits: {}
memory: 60Mi
requests: requests:
cpu: 100m cpu: 10m
memory: 60Mi memory: 20Mi
exporter: exporter:
limits: limits: {}
memory: 128Mi
requests: requests:
cpu: 50m cpu: 10m
memory: 50Mi memory: 20Mi
logcollector: logcollector:
limits: limits: {}
memory: 1Gi
requests: requests:
cpu: 100m cpu: 10m
memory: 100Mi memory: 100Mi
mgr: mgr:
limits: limits: {}
memory: 1Gi
requests: requests:
cpu: 100m cpu: 100m
memory: 512Mi memory: 500Mi
mgr-sidecar: mgr-sidecar:
limits: limits: {}
memory: 100Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 40Mi memory: 40Mi
mon: mon:
limits: limits: {}
memory: 2Gi
requests: requests:
cpu: 200m cpu: 100m
memory: 256Mi memory: 750Mi
osd: osd:
limits: limits: {}
memory: 4Gi
requests: requests:
cpu: 100m cpu: 100m
memory: 2Gi memory: 2Gi
prepareosd: prepareosd:
requests: requests:
cpu: 100m cpu: 100m
memory: 128Mi memory: 200Mi
skipUpgradeChecks: false skipUpgradeChecks: false
storage: storage:
config: config:

View File

@@ -17,6 +17,8 @@ spec:
activeStandby: true activeStandby: true
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
resources: resources:
requests: limits:
cpu: 1000m
memory: 4Gi memory: 4Gi
requests:
cpu: 100m
memory: 400Mi

View File

@@ -53,7 +53,7 @@ data:
ROOK_CSI_ENABLE_NFS: "false" ROOK_CSI_ENABLE_NFS: "false"
CSI_FORCE_CEPHFS_KERNEL_CLIENT: "true" CSI_FORCE_CEPHFS_KERNEL_CLIENT: "true"
CSI_GRPC_TIMEOUT_SECONDS: "150" 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_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_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" 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"

View File

@@ -72,11 +72,10 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
resources: resources:
limits: limits: {}
memory: 512Mi
requests: requests:
cpu: 200m cpu: 100m
memory: 128Mi memory: 100Mi
serviceAccountName: rook-ceph-system serviceAccountName: rook-ceph-system
volumes: volumes:
- name: rook-config - name: rook-config

View File

@@ -18,7 +18,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
containers: containers:
- name: rook-ceph-tools - name: rook-ceph-tools
image: quay.io/ceph/ceph:v19.2.3-20250717 image: quay.io/ceph/ceph:v20.2.1@sha256:0bae386bc859cd9a05b804d1ca16cca8853a64f90809044e2bf43095419dc337
command: command:
- /bin/bash - /bin/bash
- -c - -c
@@ -109,11 +109,10 @@ spec:
name: rook-ceph-mon name: rook-ceph-mon
key: ceph-username key: ceph-username
resources: resources:
limits: limits: {}
memory: 1Gi
requests: requests:
cpu: 100m cpu: 1m
memory: 128Mi memory: 10Mi
volumeMounts: volumeMounts:
- mountPath: /etc/ceph - mountPath: /etc/ceph
name: ceph-config name: ceph-config