Merge pull request docker-mailserver#167 from DuncanvR/fix/service-private-ip

Fix service template to set ClusterIP

Author: cfis

charts/docker-mailserver/templates/service.yaml

@@ -142,12 +142,6 @@ spec:
   {{- end }}
 
   type: {{ default "ClusterIP" .Values.service.type }}
-  {{- if eq .Values.service.type "LoadBalancer" }}
-    {{- if .Values.service.loadBalancer.publicIp }}
-  loadBalancerIP: {{ .Values.service.loadBalancer.publicIp }}
-      {{- if .Values.service.loadBalancer.allowedIps }}
-  loadBalancerSourceRanges:
-  {{ .Values.service.loadBalancer.allowedIps | toYaml | indent 4 }}
-      {{- end }}
-    {{- end }}
+  {{- if .Values.service.clusterIp }}
+  clusterIP: {{ .Values.service.clusterIp }}
   {{- end }}

charts/docker-mailserver/values.yaml

@@ -306,18 +306,7 @@ service:
   ## Note: It's quite unlikely that an IP should be specific. Normally, the best thing to do is leave it to Kubernetes
   ##       to allocate a free IP from the pool.
   ## Default: Automatically assign a random IP
-  # privateIp:
-  ## Only relevant if the `type` above is "LoadBalancer"
-  loadBalancer:
-    ## If there is already a reserved public IP that this load balancer should use, indicate it here.
-    ## Default: Automatically assign a random, ephemeral IP
-    # publicIp:
-    ## If there should be firewall rules restricting the load balancer to a limited set of IPs, specify those IPs below
-    ## in CIDR format. If all IPs should be allowed access, set the CIDR as "0.0.0.0/0"
-    allowedIps:
-      - "0.0.0.0/0"
-    ## If there is a Hostname associated with this site, add it here and it will be rendered in the documentation.
-    # hostName:
+  # clusterIp:
   annotations: {}
   labels: {}