Merge pull request #18 from bklang/external_traffic_policy

Fix load balancer traffic policy

Author: funkypenguin

charts/docker-mailserver/templates/service.yaml

@@ -11,9 +11,6 @@ metadata:
     prometheus.io/path: {{ .Values.monitoring.service.path | quote }}
     prometheus.io/port: {{ .Values.monitoring.service.port | quote }}
     ##  
-    ## If a load balancer is being used, ensure that the newer type of LB that passes along IP information is used
-    ## rather than the legacy one.
-    {{- if eq .Values.service.type "LoadBalancer" }}service.beta.kubernetes.io/external-traffic: "OnlyLocal"{{ end }}
   {{- if .Values.service.annotations }}
   {{ toYaml .Values.service.annotations | indent 2 }}  
   {{ end }}    
@@ -24,6 +21,13 @@ metadata:
     release: "{{ .Release.Name }}"
   name: {{ template "dockermailserver.fullname" . }}
 spec:
+  ## If a load balancer is being used, ensure that the newer type of LB that passes along IP information is used
+  ## rather than the legacy one.
+  {{- if eq .Values.service.type "LoadBalancer" }}
+  externalTrafficPolicy: Local
+  {{ else }}
+  externalTrafficPolicy: Cluster
+  {{ end }}
   selector:
     app: {{ template "dockermailserver.fullname" . }}
     release: "{{ .Release.Name }}"
@@ -87,8 +91,7 @@ spec:
   loadBalancerIP: {{ .Values.service.loadBalancer.publicIp }}
   {{ if .Values.service.loadBalancer.allowedIps -}}
   loadBalancerSourceRanges:
-{{ .Values.service.loadBalancer.allowedIps | toYaml | indent 4 }}
+  {{ .Values.service.loadBalancer.allowedIps | toYaml | indent 4 }}
   {{ end -}}
   {{ end -}}
   {{ end }}
-  externalTrafficPolicy: Local