fix(chart): Disable openebs webhook cleanup when legacy.enabled=false (…

…#249) Signed-off-by: Niladri Halder <niladri.halder@mayadata.io>
openebs · Aug 9, 2021 · 125a67a · 125a67a
1 parent 0bdac0a
commit 125a67a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/charts/openebs/Chart.yaml b/charts/openebs/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 2.11.4
+version: 2.11.5
 name: openebs
 appVersion: 2.11.0
 description: Containerized Storage for Containers

diff --git a/charts/openebs/README.md b/charts/openebs/README.md
@@ -185,9 +185,6 @@ helm install openebs openebs/openebs --namespace openebs --create-namespace
 #### Install cStor with CSI driver
 ```bash
 helm install openebs openebs/openebs --namespace openebs --create-namespace \
---set localprovisioner.enabled=false \
---set ndm.enabled=false \
---set ndmOperator.enabled=false \
 --set legacy.enabled=false \
 --set cstor.enabled=true \
 --set openebs-ndm.enabled=true
@@ -196,9 +193,6 @@ helm install openebs openebs/openebs --namespace openebs --create-namespace \
 #### Install Jiva with CSI driver
 ```bash
 helm install openebs openebs/openebs --namespace openebs --create-namespace \
---set localprovisioner.enabled=false \
---set ndm.enabled=false \
---set ndmOperator.enabled=false \
 --set legacy.enabled=false \
 --set jiva.enabled=true \
 --set openebs-ndm.enabled=true \
@@ -208,32 +202,23 @@ helm install openebs openebs/openebs --namespace openebs --create-namespace \
 #### Install ZFS Local PV
 ```bash
 helm install openebs openebs/openebs --namespace openebs --create-namespace \
---set localprovisioner.enabled=false \
---set ndm.enabled=false \
---set ndmOperator.enabled=false \
 --set legacy.enabled=false \
 --set zfs-localpv.enabled=true
 ```
 
 #### Install LVM Local PV
 ```bash
 helm install openebs openebs/openebs --namespace openebs --create-namespace \
---set localprovisioner.enabled=false \
---set ndm.enabled=false \
---set ndmOperator.enabled=false \
 --set legacy.enabled=false \
 --set lvm-localpv.enabled=true
 ```
 
 #### Install Local PV hostpath and device
 ```bash
 helm install openebs openebs/openebs --namespace openebs --create-namespace \
---set localprovisioner.enabled=false \
---set ndm.enabled=false \
---set ndmOperator.enabled=false \
---set openebs-ndm.enabled=true \
 --set legacy.enabled=false \
 --set localpv-provisioner.enabled=true
+--set openebs-ndm.enabled=true \
 ```
 
 > **Tip**: You can install multiple csi driver by merging the configuration.
diff --git a/charts/openebs/templates/cleanup-webhook.yaml b/charts/openebs/templates/cleanup-webhook.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.webhook.enabled }}
+{{- if and (.Values.webhook.enabled) (.Values.legacy.enabled) }}
 # HELM first deletes RBAC, then it tries to delete other resources like SPC and PVC. 
 # We've got validating webhook on SPC and PVC.
 # But even that the policy of this webhook is Ignore, it fails because the ServiceAccount