Allow setting of volumeClaimDeletePolicy in eck-elasticsearch Helm chart

deploy/eck-elasticsearch/Chart.yaml

@@ -3,7 +3,7 @@ name: eck-elasticsearch
 description: A Helm chart to deploy Elasticsearch managed by the ECK Operator.
 kubeVersion: ">= 1.21.0-0"
 type: application
-version: 0.3.0
+version: 0.4.0
 sources:
   - https://github.com/elastic/cloud-on-k8s
   - https://github.com/elastic/elasticsearch/

deploy/eck-elasticsearch/templates/elasticsearch.yaml

@@ -40,6 +40,13 @@ spec:
   remoteClusters:
     {{- toYaml .Values.remoteClusters | nindent 2 }}
   {{- end }}
+  {{- if .Values.volumeClaimDeletePolicy }}
+  volumeClaimDeletePolicy:
+    {{- if and (not (eq .Values.volumeClaimDeletePolicy "DeleteOnScaledownOnly")) (not (eq .Values.volumeClaimDeletePolicy "DeleteOnScaledownAndClusterDeletion")) }}
+    {{ fail "volumeClaimDeletePolicy can only be one of 'DeleteOnScaledownOnly' or 'DeleteOnScaledownAndClusterDeletion'" }}
+    {{- end }}
+    {{- toYaml .Values.volumeClaimDeletePolicy | nindent 4 }}
+  {{- end }}
   {{- if eq (len .Values.nodeSets) 0 }}
   {{ fail "At least one nodeSet is required" }}
   {{- end }}

deploy/eck-elasticsearch/templates/tests/elasticsearch_test.yaml

@@ -38,6 +38,25 @@ tests:
       - equal:
           path: metadata.name
           value: override
+  - it: setting volumeClaimDeletePolicy should work properly
+    set:
+      volumeClaimDeletePolicy: DeleteOnScaledownOnly
+    release:
+      name: quickstart
+    asserts:
+      - isKind:
+          of: Elasticsearch
+      - equal:
+          path: spec.volumeClaimDeletePolicy
+          value: DeleteOnScaledownOnly
+  - it: setting volumeClaimDeletePolicy incorrectly should fail
+    set:
+      volumeClaimDeletePolicy: invalid
+    release:
+      name: quickstart
+    asserts:
+      - failedTemplate:
+          errorMessage: volumeClaimDeletePolicy can only be one of 'DeleteOnScaledownOnly' or 'DeleteOnScaledownAndClusterDeletion'
   - it: should render labels, annotations, and additional custom values properly
     set:
       labels:
@@ -89,7 +108,7 @@ tests:
             app.kubernetes.io/instance: quickstart
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-elasticsearch
-            helm.sh/chart: eck-elasticsearch-0.3.0
+            helm.sh/chart: eck-elasticsearch-0.4.0
             test: label
       - equal:
           path: metadata.annotations

deploy/eck-elasticsearch/values.yaml

@@ -115,6 +115,11 @@ remoteClusters: {}
   #     name: cluster-two
   #     namespace: ns-two
 
+# VolumeClaimDeletePolicy sets the policy for handling deletion of PersistentVolumeClaims for all NodeSets.
+# Possible values are DeleteOnScaledownOnly and DeleteOnScaledownAndClusterDeletion.
+# Defaults to DeleteOnScaledownAndClusterDeletion if unset.
+volumeClaimDeletePolicy: ""
+
 # Node configuration settings.
 # The node roles which can be configured here are:
 # - "master"

deploy/eck-stack/Chart.yaml

@@ -14,7 +14,7 @@ version: 0.4.0
 dependencies:
   - name: eck-elasticsearch
     condition: eck-elasticsearch.enabled
-    version: "0.3.0"
+    version: "0.4.0"
     # uncomment for local testing, and comment
     # the helm.elastic.co repository.
     # repository: "file://../eck-elasticsearch"