From f3acaa55214712b5913036dd0a8a6f5eb94ab894 Mon Sep 17 00:00:00 2001
From: Wagner Sartori Junior <wsartori@gmail.com>
Date: Thu, 16 Nov 2023 05:43:43 +0100
Subject: [PATCH] fix(helm): Possibility to override zfs encryption keys
 directory (#487)

Helm charts was hardcoding zfs encryption keys directory and on some
distributions /home is read-only. This commit will make it possible to
set it as a helm value.

Fixes #477

Signed-off-by: Wagner Sartori Junior <wsartori@wsartori.com>
---
 changelogs/unreleased/487-trunet.md        | 1 +
 deploy/helm/charts/Chart.yaml              | 2 +-
 deploy/helm/charts/README.md               | 1 +
 deploy/helm/charts/templates/zfs-node.yaml | 2 +-
 deploy/helm/charts/values.yaml             | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/487-trunet.md

diff --git a/changelogs/unreleased/487-trunet.md b/changelogs/unreleased/487-trunet.md
new file mode 100644
index 000000000..2da45404e
--- /dev/null
+++ b/changelogs/unreleased/487-trunet.md
@@ -0,0 +1 @@
+fix(helm): Possibility to override zfs encryption keys directory
\ No newline at end of file
diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml
index 4696c26f0..20d0fdc14 100644
--- a/deploy/helm/charts/Chart.yaml
+++ b/deploy/helm/charts/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: zfs-localpv
 description: Helm chart for CSI Driver for dynamic provisioning of ZFS Persistent Local Volumes. For instructions on how to use this helm chart, see - https://openebs.github.io/zfs-localpv/
-version: 2.3.1
+version: 2.3.2
 appVersion: 2.3.0
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
 home: https://openebs.io/
diff --git a/deploy/helm/charts/README.md b/deploy/helm/charts/README.md
index d30f55026..038ab71b2 100644
--- a/deploy/helm/charts/README.md
+++ b/deploy/helm/charts/README.md
@@ -86,6 +86,7 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv
 | `zfsNode.driverRegistrar.image.tag`| Image tag for csi-node-driver-registrar| `v2.8.0`|
 | `zfsNode.updateStrategy.type`| Update strategy for zfsnode daemonset | `RollingUpdate` |
 | `zfsNode.kubeletDir`| Kubelet mount point for zfsnode daemonset| `"/var/lib/kubelet/"` |
+| `zfsNode.encrKeysDir` | Zfs encryption key directory| `"/home/keys"` |
 | `zfsNode.annotations` | Annotations for zfsnode daemonset metadata| `""`|
 | `zfsNode.podAnnotations`| Annotations for zfsnode daemonset's pods metadata | `""`|
 | `zfsNode.resources`| Resource and request and limit for zfsnode daemonset containers | `""`|
diff --git a/deploy/helm/charts/templates/zfs-node.yaml b/deploy/helm/charts/templates/zfs-node.yaml
index 58762c8b7..74859dd7a 100644
--- a/deploy/helm/charts/templates/zfs-node.yaml
+++ b/deploy/helm/charts/templates/zfs-node.yaml
@@ -118,7 +118,7 @@ spec:
             type: Directory
         - name: encr-keys
           hostPath:
-            path: /home/keys
+            path: {{ .Values.zfsNode.encrKeysDir }}
             type: DirectoryOrCreate
         - name: chroot-zfs
           configMap:
diff --git a/deploy/helm/charts/values.yaml b/deploy/helm/charts/values.yaml
index ae0e21dfe..8bf2f9156 100644
--- a/deploy/helm/charts/values.yaml
+++ b/deploy/helm/charts/values.yaml
@@ -38,6 +38,7 @@ zfsNode:
   # This can be configured to run on various different k8s distributions like
   # microk8s where kubelet dir is different
   kubeletDir: "/var/lib/kubelet/"
+  encrKeysDir: "/home/keys"
   # limits:
   #   cpu: 10m
   #   memory: 32Mi