add an opt-in parameter to enable volumeClaimTemplate labels.

elastic · Jun 25, 2020 · ed54111 · ed54111
1 parent be3c093
commit ed54111
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
@@ -26,6 +26,7 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: {{ template "elasticsearch.uname" . }}
+    {{- if .Values.labels.enabled }}
       labels:
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
@@ -34,6 +35,7 @@ spec:
         {{- range $key, $value := .Values.labels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+    {{- end }}
     {{- with .Values.persistence.annotations  }}
       annotations:
 {{ toYaml . | indent 8 }}

diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
@@ -118,6 +118,9 @@ podSecurityPolicy:
 
 persistence:
   enabled: true
+  labels:
+    # Add default labels for the volumeClaimTemplate fo the StatefulSet
+    enabled: false
   annotations: {}
 
 extraVolumes: []