add support for providing additional volumes and adding init containers

Signed-off-by: Jesse Nelson <jesse@swirldslabs.com> Signed-off-by: Niladri Halder <niladri.halder26@gmail.com>
openebs · Jul 26, 2023 · d9a1757 · d9a1757
1 parent 66f7754
commit d9a1757
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/changelogs/unreleased/454-jnels124.md b/changelogs/unreleased/454-jnels124.md
@@ -0,0 +1 @@
+add support to deployment yaml to allower user to specify additional volumes and init containers
diff --git a/deploy/helm/charts/templates/zfs-contoller.yaml b/deploy/helm/charts/templates/zfs-contoller.yaml
@@ -38,6 +38,13 @@ spec:
       priorityClassName: {{ template "zfslocalpv.zfsController.priorityClassName" . }}
 {{- end }}
       serviceAccountName: {{ .Values.serviceAccount.zfsController.name }}
+{{- if .Values.zfsController.initContainers }}
+      initContainers:
+{{- range $key, $value := .Values.zfsController.initContainers }}
+        - name: {{ $key }}
+{{ toYaml $value | indent 10 }}
+{{- end }}
+{{- end }}
       containers:
         - name: {{ .Values.zfsController.resizer.name }}
           image: "{{ .Values.zfsController.resizer.image.registry }}{{ .Values.zfsController.resizer.image.repository }}:{{ .Values.zfsController.resizer.image.tag }}"
@@ -121,6 +128,12 @@ spec:
       volumes:
         - name: socket-dir
           emptyDir: {}
+{{- if .Values.zfsController.additionalVolumes }}
+{{- range $name, $config := .Values.zfsController.additionalVolumes }}
+        - name: {{ $name }}
+{{- tpl (toYaml $config) $ | nindent 10 }}
+{{- end }}
+{{- end }}
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 2 }}

diff --git a/deploy/helm/charts/templates/zfs-node.yaml b/deploy/helm/charts/templates/zfs-node.yaml
@@ -31,6 +31,13 @@ spec:
 {{- end }}
       serviceAccountName: {{ .Values.serviceAccount.zfsNode.name }}
       hostNetwork: true
+{{- if .Values.zfsNode.initContainers }}
+      initContainers:
+{{- range $key, $value := .Values.zfsNode.initContainers }}
+        - name: {{ $key }}
+{{ toYaml $value | indent 10 }}
+{{- end }}
+{{- end }}
       containers:
         - name: {{ .Values.zfsNode.driverRegistrar.name }}
           image: "{{ .Values.zfsNode.driverRegistrar.image.registry }}{{ .Values.zfsNode.driverRegistrar.image.repository }}:{{ .Values.zfsNode.driverRegistrar.image.tag }}"
@@ -132,6 +139,12 @@ spec:
           hostPath:
             path: {{ .Values.zfsNode.kubeletDir }}
             type: Directory
+{{- if .Values.zfsNode.additionalVolumes }}
+{{- range $name, $config := .Values.zfsNode.additionalVolumes }}
+        - name: {{ $name }}
+{{- tpl (toYaml $config) $ | nindent 10 }}
+{{- end }}
+{{- end }}
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 2 }}