Logstash: Add option to configure PVC labels in StatefulSets

logstash/templates/statefulset.yaml

@@ -25,6 +25,16 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: {{ template "logstash.fullname" . }}
+      {{- if .Values.persistence.labels.enabled }}
+      labels:
+        app: "{{ template "logstash.fullname" . }}"
+        chart: "{{ .Chart.Name }}"
+        heritage: {{ .Release.Service | quote }}
+        release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     {{- with .Values.persistence.annotations  }}
       annotations:
 {{ toYaml . | indent 8 }}

logstash/tests/logstash_test.py

@@ -301,6 +301,19 @@ def test_adding_persistence():
     assert v["spec"]["resources"]["requests"]["storage"] == "1Gi"
 
 
+def test_adding_persistence_label_in_volumeclaimtemplate():
+    config = """
+persistence:
+  enabled: true
+  labels:
+    enabled: true
+"""
+    r = helm_template(config)
+    v = r["statefulset"][name]["spec"]["volumeClaimTemplates"][0]["metadata"]["labels"]
+    sts = r["statefulset"][name]["metadata"]["labels"]
+    assert v == sts
+
+
 def test_adding_storageclass_annotation_to_volumeclaimtemplate():
     config = """
 persistence:

logstash/values.yaml

@@ -126,6 +126,9 @@ podSecurityPolicy:
 
 persistence:
   enabled: false
+  # Add default labels for the volumeClaimTemplate fo the StatefulSet
+  labels:
+    enabled: false
   annotations: {}
 
 extraVolumes: