[ceph] fix yet another issue with tenplate and nil

sapcc · Oct 23, 2024 · 6800bde · 6800bde
1 parent 405fb90
commit 6800bde
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/system/cc-ceph/Chart.yaml b/system/cc-ceph/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cc-ceph
 description: A Helm chart for the Rook / Ceph Objects inside the Storage Clusters
 type: application
-version: 1.0.91
+version: 1.0.92
 appVersion: "1.15.0"
 dependencies:
   - name: owner-info

diff --git a/system/cc-ceph/templates/cephobjectstore-placement-pools.yaml b/system/cc-ceph/templates/cephobjectstore-placement-pools.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.rgwTargetPlacements.enabled }}
 {{- range $target := .Values.rgwTargetPlacements.placements }}
-{{- if $.Values.rgwTargetPlacements.nvme.enabled }}
+{{- if and $.Values.rgwTargetPlacements.nvme $.Values.rgwTargetPlacements.nvme.enabled }}
 ---
 apiVersion: ceph.rook.io/v1
 kind: CephBlockPool

diff --git a/system/cc-ceph/values.yaml b/system/cc-ceph/values.yaml
@@ -159,7 +159,14 @@ objectstore:
     interval: "10"
 
 rgwTargetPlacements:
-  enabled: false
+  enabled: true
+  nvme:
+    enabled: true
+  placements:
+  - name: region-3
+    size: 3
+    failureDomain: zone
+    crushRoot: default
 
 defaultRgwPools:
   enabled: false # create default rgw pools, see: https://github.com/sapcc/helm-charts/issues/6670