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 #8592

Merged
merged 9 commits into from
Jan 2, 2025
Merged

Conversation

onedr0p
Copy link
Owner

@onedr0p onedr0p commented Jan 2, 2025

No description provided.

@bot-ross bot-ross bot added area/kubernetes Changes made in the kubernetes directory cluster/main labels Jan 2, 2025
@bot-ross
Copy link
Contributor

bot-ross bot commented Jan 2, 2025

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

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

@@ -33,30 +33,33 @@

       retries: 3
       strategy: rollback
   values:
     cephBlockPools:
     - name: ceph-blockpool
       spec:
+        enableRBDStats: true
         failureDomain: host
         replicated:
           size: 3
       storageClass:
         allowVolumeExpansion: true
         enabled: true
         isDefault: true
         mountOptions:
         - discard
         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,fast-diff,object-map,deep-flatten,exclusive-lock
           imageFormat: '2'
         reclaimPolicy: Delete
         volumeBindingMode: Immediate
     cephBlockPoolsVolumeSnapshotClass:
       deletionPolicy: Delete
@@ -85,27 +88,12 @@

         - enabled: true
           name: rook
       network:
         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:
         config:
           osdsPerDevice: '1'
         devicePathFilter: /dev/disk/by-id/nvme-Micron_7450_MTFDKBA800TFS_.*
         useAllDevices: false
         useAllNodes: true
@@ -148,18 +136,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
         volumeBindingMode: Immediate
     cephObjectStores: []
     configOverride: |
       [global]

@bot-ross
Copy link
Contributor

bot-ross 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

@@ -73,27 +73,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:

@bot-ross bot-ross bot added the area/github Changes made in the github directory label Jan 2, 2025
@onedr0p onedr0p changed the title feat(rook-ceph): enable collecting RBD per-image IO statistics feat(rook-ceph): collect RBD per-image IO statistics and set device class Jan 2, 2025
@onedr0p onedr0p changed the title feat(rook-ceph): collect RBD per-image IO statistics and set device class feat(rook-ceph): collect RBD per-image IO statistics Jan 2, 2025
@onedr0p onedr0p merged commit 344356c into main Jan 2, 2025
10 checks passed
@onedr0p onedr0p deleted the onedr0p-patch-2 branch January 2, 2025 04:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/github Changes made in the github directory area/kubernetes Changes made in the kubernetes directory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant