From 7527c164777823fbf023e0bcd7b81ad3d6757278 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 3 Oct 2021 13:13:53 +0200
Subject: [PATCH] rook: Fix ceph-cluster values
Apparently one has to specify all the parameters otherwise helm will
complain with:
```
Error: YAML parse error on rook-ceph-cluster/templates/cephblockpool.yaml: error converting YAML to JSON: yaml: line 12: could not find expected ':'
```
---
infrastructure/rook/release.yaml | 40 ++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/infrastructure/rook/release.yaml b/infrastructure/rook/release.yaml
index ba31df965..15245575d 100644
--- a/infrastructure/rook/release.yaml
+++ b/infrastructure/rook/release.yaml
@@ -149,12 +149,48 @@ spec:
osdMaintenanceTimeout: 30
pgHealthCheckTimeout: 0
cephBlockPools:
- - name: replicapool
+ - name: ceph-blockpool
+ # see https://github.com/rook/rook/blob/master/Documentation/ceph-pool-crd.md#spec for available configuration
spec:
failureDomain: host
replicated:
size: 2
- requireSafeReplicaSize: true
storageClass:
enabled: true
+ name: ceph-block
isDefault: true
+ reclaimPolicy: Delete
+ allowVolumeExpansion: true
+ # see https://github.com/rook/rook/blob/master/Documentation/ceph-block.md#provision-storage for available configuration
+ parameters:
+ # (optional) mapOptions is a comma-separated list of map options.
+ # For krbd options refer
+ # https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options
+ # For nbd options refer
+ # https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options
+ # mapOptions: lock_on_read,queue_depth=1024
+
+ # (optional) unmapOptions is a comma-separated list of unmap options.
+ # For krbd options refer
+ # https://docs.ceph.com/docs/master/man/8/rbd/#kernel-rbd-krbd-options
+ # For nbd options refer
+ # https://docs.ceph.com/docs/master/man/8/rbd-nbd/#options
+ # unmapOptions: force
+
+ # RBD image format. Defaults to "2".
+ imageFormat: "2"
+ # RBD image features. Available for imageFormat: "2". CSI RBD currently supports only `layering` feature.
+ imageFeatures: layering
+ # The secrets contain Ceph admin credentials.
+ csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
+ csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
+ 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/node-stage-secret-name: rook-csi-rbd-node
+ csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
+ # Specify the filesystem type of the volume. If not specified, csi-provisioner
+ # will set default as `ext4`. Note that `xfs` is not recommended due to potential deadlock
+ # in hyperconverged settings where the volume is mounted on the same node as the osds.
+ csi.storage.k8s.io/fstype: ext4
+ cephObjectStores: []
+ cephFileSystems: []
--
GitLab