fix: expose the zk and bk accessModes config in values (#1132)

* fix: expose the zk and bk accessModes config in values Signed-off-by: ericsyh <[email protected]> * apply to sn-platform chart Signed-off-by: ericsyh <[email protected]> * fix lint Signed-off-by: ericsyh <[email protected]> --------- Signed-off-by: ericsyh <[email protected]> (cherry picked from commit e14cc48)
streamnative · Dec 4, 2023 · 2356477 · 2356477
1 parent 9fe0526
commit 2356477
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 13 deletions.
diff --git a/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml b/charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml
@@ -130,7 +130,9 @@ spec:
       numDirsPerVolume: {{ .Values.bookkeeper.volumes.journal.numDirsPerVolume | default 1 }}
       volumeClaimTemplate:
         accessModes:
-          - ReadWriteOnce
+        {{- range .Values.bookkeeper.volumes.journal.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
         resources:
           requests:
             storage: {{ .Values.bookkeeper.volumes.journal.size }}
@@ -140,7 +142,9 @@ spec:
       numDirsPerVolume: {{ .Values.bookkeeper.volumes.ledgers.numDirsPerVolume | default 1 }}
       volumeClaimTemplate:
         accessModes:
-          - ReadWriteOnce
+        {{- range .Values.bookkeeper.volumes.ledgers.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
         resources:
           requests:
             storage: {{ .Values.bookkeeper.volumes.ledgers.size }}

diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
@@ -163,14 +163,18 @@ spec:
   persistence:
     data:
       accessModes:
-        - ReadWriteOnce
+      {{- range .Values.zookeeper.volumes.data.accessModes }}
+        - {{ . | quote }}
+      {{- end }}
       resources:
         requests:
           storage: {{ .Values.zookeeper.volumes.data.size }}
 {{- include "pulsar.zookeeper.data.storage.class" . | nindent 6 }}
     dataLog:
       accessModes:
-        - ReadWriteOnce
+      {{- range .Values.zookeeper.volumes.dataLog.accessModes }}
+        - {{ . | quote }}
+      {{- end }}
       resources:
         requests:
           {{- if .Values.zookeeper.volumes.useSeparateDiskForTxlog }}

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -638,6 +638,8 @@ zookeeper:
     data:
       name: data
       size: 50Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.
@@ -656,6 +658,8 @@ zookeeper:
     dataLog:
       name: datalog
       size: 10Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.
@@ -859,6 +863,8 @@ bookkeeper:
       numDirsPerVolume: 1
       name: journal
       size: 10Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.
@@ -875,11 +881,13 @@ bookkeeper:
       #   extraParameters:
       #     iopsPerGB: "50"
     ledgers:
-      name: ledgers
-      size: 50Gi
       # It determines the directory of ledgers data
       numVolumes: 1
       numDirsPerVolume: 1
+      name: ledgers
+      size: 50Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.

diff --git a/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml b/charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml
@@ -130,7 +130,9 @@ spec:
       numDirsPerVolume: {{ .Values.bookkeeper.volumes.journal.numDirsPerVolume | default 1 }}
       volumeClaimTemplate:
         accessModes:
-          - ReadWriteOnce
+        {{- range .Values.bookkeeper.volumes.journal.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
         resources:
           requests:
             storage: {{ .Values.bookkeeper.volumes.journal.size }}
@@ -140,7 +142,9 @@ spec:
       numDirsPerVolume: {{ .Values.bookkeeper.volumes.ledgers.numDirsPerVolume | default 1 }}
       volumeClaimTemplate:
         accessModes:
-          - ReadWriteOnce
+        {{- range .Values.bookkeeper.volumes.journal.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
         resources:
           requests:
             storage: {{ .Values.bookkeeper.volumes.ledgers.size }}

diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
@@ -163,14 +163,18 @@ spec:
   persistence:
     data:
       accessModes:
-        - ReadWriteOnce
-      resources:
+      {{- range .Values.zookeeper.volumes.data.accessModes }}
+        - {{ . | quote }}
+      {{- end }}
+    resources:
         requests:
           storage: {{ .Values.zookeeper.volumes.data.size }}
 {{- include "pulsar.zookeeper.data.storage.class" . | nindent 6 }}
     dataLog:
       accessModes:
-        - ReadWriteOnce
+      {{- range .Values.zookeeper.volumes.dataLog.accessModes }}
+        - {{ . | quote }}
+      {{- end }}
       resources:
         requests:
           {{- if .Values.zookeeper.volumes.useSeparateDiskForTxlog }}

diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
@@ -713,6 +713,8 @@ zookeeper:
     data:
       name: data
       size: 50Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.
@@ -731,6 +733,8 @@ zookeeper:
     dataLog:
       name: datalog
       size: 10Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.
@@ -934,6 +938,8 @@ bookkeeper:
       numDirsPerVolume: 1
       name: journal
       size: 10Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.
@@ -950,11 +956,13 @@ bookkeeper:
       #   extraParameters:
       #     iopsPerGB: "50"
     ledgers:
-      name: ledgers
-      size: 50Gi
       # It determines the directory of ledgers data
       numVolumes: 1
       numDirsPerVolume: 1
+      name: ledgers
+      size: 50Gi
+      accessModes:
+        - ReadWriteOnce
       # storageClassName: ""
       ## If the storage class is left undefined when using persistence
       ## the default storage class for the cluster will be used.