refactor(charts): simplify CRD helm chart values

Signed-off-by: Niladri Halder <[email protected]>
openebs · Mar 19, 2024 · 9268adb · 9268adb
1 parent 611aa8b
commit 9268adb
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 40 deletions.
diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml
@@ -17,7 +17,6 @@ sources:
 dependencies:
   - name: crds
     version: "1.5.0"
-    condition: crds.enabled
 maintainers:
   - name: prateekpandey14
     email: [email protected]

diff --git a/deploy/helm/charts/README.md b/deploy/helm/charts/README.md
@@ -96,7 +96,8 @@ helm install openebs-lvmlocalpv openebs-lvmlocalpv/lvm-localpv --namespace opene
 
 | Parameter                                           | Description                                                                      | Default                                 |
 |-----------------------------------------------------|----------------------------------------------------------------------------------|-----------------------------------------|
-| `imagePullSecrets`                                  | Provides image pull secrect                                                      | `""`                                    |
+| `crds.csi.volumeSnapshots.enabled`                  | Enable/Disable installation of VolumeSnapshot-related CRDs                       | `true`                                   |
+| `imagePullSecrets`                                  | Provides image pull secret                                                       | `""`                                    |
 | `lvmPlugin.image.registry`                          | Registry for openebs-lvm-plugin image                                            | `""`                                    |
 | `lvmPlugin.image.repository`                        | Image repository for openebs-lvm-plugin                                          | `openebs/lvm-driver`                    |
 | `lvmPlugin.image.pullPolicy`                        | Image pull policy for openebs-lvm-plugin                                         | `IfNotPresent`                          |

diff --git a/deploy/helm/charts/charts/crds/templates/csi-volume-snapshot-class.yaml b/deploy/helm/charts/charts/crds/templates/csi-volume-snapshot-class.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.volumeSnapshots.enabled .Values.volumeSnapshots.snapshotClassesEnabled -}}
+{{- if .Values.csi.volumeSnapshots.enabled -}}
 {{- $crdName := "volumesnapshotclasses.snapshot.storage.k8s.io" -}}
 {{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1

diff --git a/deploy/helm/charts/charts/crds/templates/csi-volume-snapshot-content.yaml b/deploy/helm/charts/charts/crds/templates/csi-volume-snapshot-content.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.volumeSnapshots.enabled .Values.volumeSnapshots.snapshotContentsEnabled -}}
+{{- if .Values.csi.volumeSnapshots.enabled -}}
 {{- $crdName := "volumesnapshotcontents.snapshot.storage.k8s.io" -}}
 {{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1

diff --git a/deploy/helm/charts/charts/crds/templates/csi-volume-snapshot.yaml b/deploy/helm/charts/charts/crds/templates/csi-volume-snapshot.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.volumeSnapshots.enabled .Values.volumeSnapshots.snapshotsEnabled -}}
+{{- if .Values.csi.volumeSnapshots.enabled -}}
 {{- $crdName := "volumesnapshots.snapshot.storage.k8s.io" -}}
 {{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1

diff --git a/deploy/helm/charts/charts/crds/templates/lvmnode.yaml b/deploy/helm/charts/charts/crds/templates/lvmnode.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.lvmNodes.enabled -}}
+{{- if .Values.lvmLocalPv.enabled -}}
 {{- $crdName := "lvmnodes.local.openebs.io" -}}
 {{- if (include "crdIsAbsent" (list $crdName)) -}}
 ##############################################

diff --git a/deploy/helm/charts/charts/crds/templates/lvmsnapshot.yaml b/deploy/helm/charts/charts/crds/templates/lvmsnapshot.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.lvmSnapshots.enabled -}}
+{{- if .Values.lvmLocalPv.enabled -}}
 {{- $crdName := "lvmsnapshots.local.openebs.io" -}}
 {{- if (include "crdIsAbsent" (list $crdName)) -}}
 ##############################################

diff --git a/deploy/helm/charts/charts/crds/templates/lvmvolume.yaml b/deploy/helm/charts/charts/crds/templates/lvmvolume.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.lvmVolumes.enabled -}}
+{{- if .Values.lvmLocalPv.enabled -}}
 {{- $crdName := "lvmvolumes.local.openebs.io" -}}
 {{- if (include "crdIsAbsent" (list $crdName)) -}}
 ##############################################

diff --git a/deploy/helm/charts/charts/crds/values.yaml b/deploy/helm/charts/charts/crds/values.yaml
@@ -1,21 +1,8 @@
-lvmNodes:
-  # -- Install ZfsNode CRD
+lvmLocalPv:
+  # Install lvm-localpv CRDs
   enabled: true
 
-lvmSnapshots:
-  # -- Install ZfsSnapshot CRD
-  enabled: true
-
-lvmVolumes:
-  # -- Install ZfsVolume CRD
-  enabled: true
-
-volumeSnapshots:
-  # -- Install Volume Snapshot CRDs
-  enabled: true
-  # -- Install volumesnapshots.snapshot.storage.k8s.io CRD
-  snapshotsEnabled: true
-  # -- Install volumesnapshotclasses.snapshot.storage.k8s.io CRD
-  snapshotClassesEnabled: true
-  # -- Install volumesnapshotcontents.snapshot.storage.k8s.io CRD
-  snapshotContentsEnabled: true
+csi:
+  volumeSnapshots:
+    # Install Volume Snapshot CRDs
+    enabled: true
diff --git a/deploy/helm/charts/values.yaml b/deploy/helm/charts/values.yaml
@@ -184,17 +184,11 @@ analytics:
   enabled: true
 
 crds:
-  # Enable/Disable all CRDs
-  enabled: true
-  lvmNodes:
-    # -- Install ZfsNode CRD
-    enabled: true
-  lvmSnapshots:
-    # -- Install ZfsSnapshot CRD
-    enabled: true
-  lvmVolumes:
-    # -- Install ZfsVolume CRD
-    enabled: true
-  volumeSnapshots:
-    # -- Install Volume Snapshot CRDs
+  lvmLocalPv:
+    # Install lvm-localpv CRDs
     enabled: true
+
+  csi:
+    volumeSnapshots:
+      # Install Volume Snapshot CRDs
+      enabled: true