Merge pull request #270 from qmiinh/fix-helm-hostpath

CLOUD-838 - psmdb-db fix: update path and type HostPath
percona · Feb 1, 2024 · daaac66 · daaac66
2 parents 34458bb + e2603b5
commit daaac66
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/charts/psmdb-db/Chart.yaml b/charts/psmdb-db/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.15.0"
 description: A Helm chart for installing Percona Server MongoDB Cluster Databases using the PSMDB Operator.
 name: psmdb-db
 home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
-version: 1.15.2
+version: 1.15.3
 maintainers:
   - name: tplavcic
     email: [email protected]

diff --git a/charts/psmdb-db/README.md b/charts/psmdb-db/README.md
@@ -93,6 +93,7 @@ The chart can be customized using the following configurable parameters:
 | `replsets[0].volumeSpec.emptyDir`       | ReplicaSet Pods emptyDir K8S storage                          | `{}`                                  |
 | `replsets[0].volumeSpec.hostPath`       | ReplicaSet Pods hostPath K8S storage                          |                                       |
 | `replsets[0].volumeSpec.hostPath.path`       | ReplicaSet Pods hostPath K8S storage path                       | `""`                                  |
+| `replsets[0].volumeSpec.hostPath.type`       | Type for hostPath volume                       | `Directory`                                  |
 | `replsets[0].volumeSpec.pvc`                   | ReplicaSet Pods PVC request parameters                       |                                       |
 | `replsets[0].volumeSpec.pvc.annotations`       | The Kubernetes annotations metadata for Persistent Volume Claim  | `{}`                                  |
 | `replsets[0].volumeSpec.pvc.labels`            | The Kubernetes labels metadata for Persistent Volume Claim       | `{}`                                  |
@@ -119,6 +120,7 @@ The chart can be customized using the following configurable parameters:
 | `replsets[0].nonvoting.volumeSpec.emptyDir`       | Nonvoting Pods emptyDir K8S storage                  | `{}`                                  |
 | `replsets[0].nonvoting.volumeSpec.hostPath`       | Nonvoting Pods hostPath K8S storage                  |                                       |
 | `replsets[0].nonvoting.volumeSpec.hostPath.path`  | Nonvoting Pods hostPath K8S storage path             | `""`                                  |
+| `replsets[0].nonvoting.volumeSpec.hostPath.type`  | Type for hostPath volume                             | `Directory`                           |
 | `replsets[0].nonvoting.volumeSpec.pvc`            | Nonvoting Pods PVC request parameters                |                                       |
 | `replsets[0].nonvoting.volumeSpec.pvc.annotations`       | The Kubernetes annotations metadata for Persistent Volume Claim  | `{}`                                  |
 | `replsets[0].nonvoting.volumeSpec.pvc.labels`            | The Kubernetes labels metadata for Persistent Volume Claim       | `{}`                                  |
@@ -172,6 +174,7 @@ The chart can be customized using the following configurable parameters:
 | `sharding.configrs.resources.requests.memory`  | Config ReplicaSet resource requests memory | `0.5G`                                |
 | `sharding.configrs.volumeSpec.hostPath`        | Config ReplicaSet hostPath K8S storage |                                       |
 | `sharding.configrs.volumeSpec.hostPath.path`   | Config ReplicaSet hostPath K8S storage path | `""`                                  |
+| `sharding.configrs.volumeSpec.hostPath.type`   | Type for hostPath volum                     | `Directory`                           |
 | `sharding.configrs.volumeSpec.emptyDir`        | Config ReplicaSet Pods emptyDir K8S storage |                                       |
 | `sharding.configrs.volumeSpec.pvc`             | Config ReplicaSet Pods PVC request parameters |                                       |
 | `sharding.configrs.volumeSpec.pvc.annotations` | The Kubernetes annotations metadata for Persistent Volume Claim  | `{}`                                  |

diff --git a/charts/psmdb-db/templates/cluster.yaml b/charts/psmdb-db/templates/cluster.yaml
@@ -191,8 +191,12 @@ spec:
     volumeSpec:
       {{- if $replset.volumeSpec.hostPath }}
       hostPath:
-        path: {{ $replset.volumeSpec.hostPath }}
+        path: {{ $replset.volumeSpec.hostPath.path }}
+        {{- if $replset.volumeSpec.hostPath.type }}
+        type: {{ $replset.volumeSpec.hostPath.type }}
+        {{- else }}
         type: Directory
+        {{- end }}
       {{- else if $replset.volumeSpec.pvc }}
       persistentVolumeClaim:
 {{ $replset.volumeSpec.pvc | toYaml | indent 8 }}
@@ -258,8 +262,12 @@ spec:
       volumeSpec:
         {{- if $replset.nonvoting.volumeSpec.hostPath }}
         hostPath:
-          path: {{ $replset.nonvoting.volumeSpec.hostPath }}
+          path: {{ $replset.nonvoting.volumeSpec.hostPath.path }}
+          {{- if $replset.nonvoting.volumeSpec.hostPath.type }}
+          type: {{ $replset.nonvoting.volumeSpec.hostPath.type }}
+          {{- else }}
           type: Directory
+          {{- end }}
         {{- else if $replset.nonvoting.volumeSpec.pvc }}
         persistentVolumeClaim:
 {{ $replset.nonvoting.volumeSpec.pvc | toYaml | indent 10 }}
@@ -413,8 +421,12 @@ spec:
       volumeSpec:
         {{- if .Values.sharding.configrs.volumeSpec.hostPath }}
         hostPath:
-          path: {{ .Values.sharding.configrs.volumeSpec.hostPath }}
+          path: {{ .Values.sharding.configrs.volumeSpec.hostPath.path }}
+          {{- if .Values.sharding.configrs.volumeSpec.hostPath.type }}
+          type: {{ .Values.sharding.configrs.volumeSpec.hostPath.type }}
+          {{- else }}
           type: Directory
+          {{- end }}
         {{- else if .Values.sharding.configrs.volumeSpec.pvc }}
         persistentVolumeClaim:
 {{ .Values.sharding.configrs.volumeSpec.pvc | toYaml | indent 10 }}

diff --git a/charts/psmdb-db/values.yaml b/charts/psmdb-db/values.yaml
@@ -196,6 +196,7 @@ replsets:
       # emptyDir: {}
       # hostPath:
       #   path: /data
+      #   type: Directory
       pvc:
         # annotations:
         #   volume.beta.kubernetes.io/storage-class: example-hostpath
@@ -252,6 +253,7 @@ replsets:
         # emptyDir: {}
         # hostPath:
         #   path: /data
+        #   type: Directory
         pvc:
           # annotations:
           #   volume.beta.kubernetes.io/storage-class: example-hostpath