Allow failureDomain to be overridden

This is needed because the default `zone` will only work
when a cluster is deployed across multiple availability zones.
In cases when a cluster is deployed in a single AZ, this value can be
changed to something else (`host` or `rack`).

Co-Authored-By: Akos Eros <[email protected]>

Author: mbaldessari

README.md

@@ -1,6 +1,6 @@
 # openshift-data-foundations
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart to install ODF on Openshift
 
@@ -18,9 +18,11 @@ A Helm chart to install ODF on Openshift
 |-----|------|---------|-------------|
 | global.datacenter.storageClassName | string | `"gp3-csi"` |  |
 | job.image | string | `"image-registry.openshift-image-registry.svc:5000/openshift/cli:latest"` |  |
+| objectStorage.dataPool.failureDomain | string | `"zone"` | Failuredomain for the dataPool |
 | objectStorage.dataPool.replicas | int | `3` |  |
 | objectStorage.enable | bool | `true` |  |
 | objectStorage.gateway.instances | int | `2` |  |
+| objectStorage.metadataPool.failureDomain | string | `"zone"` | Failuredomain for the metadataPool |
 | objectStorage.resources.limits.cpu | string | `"2"` |  |
 | objectStorage.resources.limits.memory | string | `"6Gi"` |  |
 | objectStorage.resources.requests.cpu | string | `"1"` |  |

templates/odf-cephobjectstore.yaml

@@ -9,7 +9,7 @@ spec:
     erasureCoded:
       codingChunks: 0
       dataChunks: 0
-    failureDomain: zone
+    failureDomain: {{ .Values.objectStorage.dataPool.failureDomain }}
     replicated:
       size: {{ .Values.objectStorage.dataPool.replicas | default 3 }}
   gateway:
@@ -50,7 +50,7 @@ spec:
     erasureCoded:
       codingChunks: 0
       dataChunks: 0
-    failureDomain: zone
+    failureDomain: {{ .Values.objectStorage.metadataPool.failureDomain }}
     replicated:
       size: 3
 {{- end -}}

tests/odf_cephobjectstore_test.yaml

@@ -0,0 +1,81 @@
+suite: Test CephObjectStore
+templates:
+  - templates/odf-cephobjectstore.yaml
+release:
+  name: release-test
+tests:
+  - it: Should output nothing when disabled
+    set:
+      objectStorage:
+        enable: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: Should output default values when not disabled
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: CephObjectStore
+      - containsDocument:
+          kind: CephObjectStore
+          apiVersion: ceph.rook.io/v1
+          name: ocs-storagecluster-cephobjectstore
+      - equal:
+          path: spec.dataPool.replicated.size
+          value: 3
+      - equal:
+          path: spec.gateway.instances
+          value: 2
+      - equal:
+          path: spec.gateway.resources.requests.cpu
+          value: "1"
+      - equal:
+          path: spec.gateway.resources.requests.memory
+          value: "4Gi"
+      - equal:
+          path: spec.gateway.resources.limits.cpu
+          value: "2"
+      - equal:
+          path: spec.gateway.resources.limits.memory
+          value: "6Gi"
+
+  - it: Should output custom failureDomain zones
+    set:
+      objectStorage:
+        dataPool:
+          failureDomain: rack
+        metadataPool:
+          failureDomain: host
+    asserts:
+      - equal:
+          path: spec.dataPool.failureDomain
+          value: rack
+      - equal:
+          path: spec.metadataPool.failureDomain
+          value: host
+
+  - it: Should output custom resource request limits
+    set:
+      objectStorage:
+        resources:
+          requests:
+            cpu: 10
+            memory: 100Gi
+          limits:
+            cpu: 100
+            memory: 200Gi
+    asserts:
+      - equal:
+          path: spec.gateway.resources.requests.cpu
+          value: "10"
+      - equal:
+          path: spec.gateway.resources.requests.memory
+          value: "100Gi"
+      - equal:
+          path: spec.gateway.resources.limits.cpu
+          value: "100"
+      - equal:
+          path: spec.gateway.resources.limits.memory
+          value: "200Gi"

values.yaml

@@ -50,8 +50,14 @@ objectStorage:
   enable: true
   dataPool:
     replicas: 3
+    # -- Failuredomain for the dataPool
+    failureDomain: zone
+  metadataPool:
+    # -- Failuredomain for the metadataPool
+    failureDomain: zone
   gateway:
     instances: 2
+
   resources:
     requests:
       cpu: "1"