Fix for #154: Allow different labels for regular and headless service

Author: bokysan

helm/mail/templates/service.yaml

@@ -23,20 +23,21 @@ spec:
       {{ if eq .Values.service.type "NodePort" }}nodePort: {{ .Values.service.nodePort }}{{ end }}
   selector:
     {{- $selectorLabels | nindent 4 }}
+{{- if .Values.headlessService.enabled }}
 ---
 # https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#limitations
-# StefullSets now require a headless service
+# StatefulSets now require a headless service
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ print $fullName "-headless" | quote }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- $labels | nindent 4 }}
-    {{- with .Values.service.labels }}{{ toYaml . | nindent 4 }}{{ end }}
+    {{- with .Values.headlessService.labels }}{{ toYaml . | nindent 4 }}{{ end }}
     type: headless
   annotations:
-    {{- with .Values.service.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
+    {{- with .Values.headlessService.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
 spec:
   type: ClusterIP
   clusterIP: None
@@ -47,4 +48,5 @@ spec:
       name: smtp
       {{ if eq .Values.service.type "NodePort" }}nodePort: {{ .Values.service.nodePort }}{{ end }}
   selector:
-    {{- $selectorLabels | nindent 4 }} 
+    {{- $selectorLabels | nindent 4 }} 
+{{- end -}}

helm/mail/values.yaml

@@ -21,6 +21,13 @@ service:
   annotations: {}
   # nodePort:
 
+# StatefulSets now require a headless service
+# https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#limitations
+headlessService:
+  enabled: true
+  labels: {}
+  annotations: {}
+
 metrics:
   enabled: false
   service: