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.

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

feat(rook-ceph): collect RBD per-image IO statistics #3247

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Conversation

buroa
Copy link
Owner

@buroa buroa commented Jan 2, 2025

No description provided.

@bot-blake bot-blake bot added the area/kubernetes Changes made in the kubernetes directory label Jan 2, 2025
@bot-blake
Copy link
Contributor

bot-blake bot commented Jan 2, 2025

--- kubernetes/apps/rook-ceph/rook-ceph/cluster Kustomization: flux-system/rook-ceph-cluster HelmRelease: rook-ceph/rook-ceph-cluster

+++ kubernetes/apps/rook-ceph/rook-ceph/cluster Kustomization: flux-system/rook-ceph-cluster HelmRelease: rook-ceph/rook-ceph-cluster

@@ -28,28 +28,31 @@

       retries: 3
       strategy: rollback
   values:
     cephBlockPools:
     - name: ceph-blockpool
       spec:
+        enableRBDStats: true
         failureDomain: host
         replicated:
           size: 3
       storageClass:
         allowVolumeExpansion: true
         enabled: true
         isDefault: true
         name: ceph-block
         parameters:
           csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner
-          csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph
+          csi.storage.k8s.io/controller-expand-secret-namespace: '{{ .Release.Namespace
+            }}'
           csi.storage.k8s.io/fstype: ext4
           csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node
-          csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
+          csi.storage.k8s.io/node-stage-secret-namespace: '{{ .Release.Namespace }}'
           csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
-          csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
+          csi.storage.k8s.io/provisioner-secret-namespace: '{{ .Release.Namespace
+            }}'
           imageFeatures: layering,exclusive-lock,object-map,fast-diff,deep-flatten
           imageFormat: '2'
         reclaimPolicy: Delete
     cephBlockPoolsVolumeSnapshotClass:
       deletionPolicy: Delete
       enabled: true
@@ -82,27 +85,12 @@

           - 169.254.255.0/24
           public:
           - 192.168.10.0/24
         connections:
           requireMsgr2: true
         provider: host
-      placement:
-        mgr:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-              - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: Exists
-        mon:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-              - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: Exists
       storage:
         devicePathFilter: /dev/disk/by-id/nvme-SAMSUNG_MZQL23T8HCLS-00A07_.*
         useAllDevices: false
         useAllNodes: true
     cephFileSystemVolumeSnapshotClass:
       deletionPolicy: Delete
@@ -143,18 +131,20 @@

         allowVolumeExpansion: true
         enabled: true
         isDefault: false
         name: ceph-filesystem
         parameters:
           csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner
-          csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph
+          csi.storage.k8s.io/controller-expand-secret-namespace: '{{ .Release.Namespace
+            }}'
           csi.storage.k8s.io/fstype: ext4
           csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node
-          csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
+          csi.storage.k8s.io/node-stage-secret-namespace: '{{ .Release.Namespace }}'
           csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner
-          csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
+          csi.storage.k8s.io/provisioner-secret-namespace: '{{ .Release.Namespace
+            }}'
         pool: data0
         reclaimPolicy: Delete
     cephObjectStores:
     - name: ceph-objectstore
       spec:
         dataPool:

@bot-blake
Copy link
Contributor

bot-blake bot commented Jan 2, 2025

--- HelmRelease: rook-ceph/rook-ceph-cluster CephBlockPool: rook-ceph/ceph-blockpool

+++ HelmRelease: rook-ceph/rook-ceph-cluster CephBlockPool: rook-ceph/ceph-blockpool

@@ -2,10 +2,11 @@

 apiVersion: ceph.rook.io/v1
 kind: CephBlockPool
 metadata:
   name: ceph-blockpool
   namespace: rook-ceph
 spec:
+  enableRBDStats: true
   failureDomain: host
   replicated:
     size: 3
 
--- HelmRelease: rook-ceph/rook-ceph-cluster CephCluster: rook-ceph/rook-ceph

+++ HelmRelease: rook-ceph/rook-ceph-cluster CephCluster: rook-ceph/rook-ceph

@@ -78,27 +78,12 @@

       compression:
         enabled: false
       encryption:
         enabled: false
       requireMsgr2: true
     provider: host
-  placement:
-    mgr:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: node-role.kubernetes.io/control-plane
-              operator: Exists
-    mon:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: node-role.kubernetes.io/control-plane
-              operator: Exists
   priorityClassNames:
     mgr: system-cluster-critical
     mon: system-node-critical
     osd: system-node-critical
   removeOSDsIfOutAndSafeToRemove: false
   resources:

@buroa buroa merged commit cbfbbfd into master Jan 2, 2025
10 checks passed
@buroa buroa deleted the buroa/ceph-feat branch January 2, 2025 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/kubernetes Changes made in the kubernetes directory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant