Skip to content

Commit 8f316a7

Browse files
authored
Merge pull request #328 from lsst-it/IT-5263/ceph-features
(fleet/rook-ceph-cluster) enable modern ceph rbd features + discard flag
2 parents aeb8cc7 + c211907 commit 8f316a7

File tree

11 files changed

+27
-11
lines changed

11 files changed

+27
-11
lines changed

fleet/lib/rook-ceph-cluster/overlays/ayekan/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,13 @@ cephBlockPools:
213213
isDefault: true
214214
reclaimPolicy: Delete
215215
allowVolumeExpansion: true
216+
mountOptions:
217+
- discard
216218
parameters:
217219
clusterID: rook-ceph
218220
pool: replicapool
219221
imageFormat: "2"
220-
imageFeatures: layering
222+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
221223
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
222224
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
223225
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/gaw/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,13 @@ cephBlockPools:
255255
isDefault: true
256256
reclaimPolicy: Delete
257257
allowVolumeExpansion: true
258+
mountOptions:
259+
- discard
258260
parameters:
259261
clusterID: rook-ceph
260262
pool: replicapool
261263
imageFormat: "2"
262-
imageFeatures: layering
264+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
263265
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
264266
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
265267
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/kueyen/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,13 @@ cephBlockPools:
204204
isDefault: true
205205
reclaimPolicy: Delete
206206
allowVolumeExpansion: true
207+
mountOptions:
208+
- discard
207209
parameters:
208210
clusterID: rook-ceph
209211
pool: replicapool
210212
imageFormat: "2"
211-
imageFeatures: layering
213+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
212214
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
213215
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
214216
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/luan/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,13 @@ cephBlockPools:
215215
isDefault: true
216216
reclaimPolicy: Delete
217217
allowVolumeExpansion: true
218+
mountOptions:
219+
- discard
218220
parameters:
219221
clusterID: rook-ceph
220222
pool: replicapool
221223
imageFormat: "2"
222-
imageFeatures: layering
224+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
223225
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
224226
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
225227
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/lukay/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ cephBlockPools:
248248
clusterID: rook-ceph
249249
pool: replicapool
250250
imageFormat: "2"
251-
imageFeatures: layering
251+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
252252
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
253253
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
254254
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/manke/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ cephBlockPools:
249249
clusterID: rook-ceph
250250
pool: replicapool
251251
imageFormat: "2"
252-
imageFeatures: layering
252+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
253253
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
254254
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
255255
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/namkueyen/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ cephBlockPools:
208208
clusterID: rook-ceph
209209
pool: replicapool
210210
imageFormat: "2"
211-
imageFeatures: layering
211+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
212212
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
213213
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
214214
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/pillan/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,13 @@ cephBlockPools:
240240
isDefault: true
241241
reclaimPolicy: Delete
242242
allowVolumeExpansion: true
243+
mountOptions:
244+
- discard
243245
parameters:
244246
clusterID: rook-ceph
245247
pool: replicapool
246248
imageFormat: "2"
247-
imageFeatures: layering
249+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
248250
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
249251
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
250252
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/ruka/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,13 @@ cephBlockPools:
212212
isDefault: true
213213
reclaimPolicy: Delete
214214
allowVolumeExpansion: true
215+
mountOptions:
216+
- discard
215217
parameters:
216218
clusterID: rook-ceph
217219
pool: replicapool
218220
imageFormat: "2"
219-
imageFeatures: layering
221+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
220222
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
221223
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
222224
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

fleet/lib/rook-ceph-cluster/overlays/yagan/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,13 @@ cephBlockPools:
289289
isDefault: true
290290
reclaimPolicy: Delete
291291
allowVolumeExpansion: true
292+
mountOptions:
293+
- discard
292294
parameters:
293295
clusterID: rook-ceph
294296
pool: replicapool
295297
imageFormat: "2"
296-
imageFeatures: layering
298+
imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock
297299
csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
298300
csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
299301
csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner

0 commit comments

Comments
 (0)