diff --git a/incubator/haproxy-ingress/Chart.yaml b/incubator/haproxy-ingress/Chart.yaml index 6939714075..417551bc2d 100644 --- a/incubator/haproxy-ingress/Chart.yaml +++ b/incubator/haproxy-ingress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: haproxy-ingress -version: 0.0.26 +version: 0.0.27 appVersion: 0.7.2 home: https://github.com/jcmoraisjr/haproxy-ingress description: Ingress controller implementation for haproxy loadbalancer. diff --git a/incubator/haproxy-ingress/README.md b/incubator/haproxy-ingress/README.md index 52a7411016..f245078924 100755 --- a/incubator/haproxy-ingress/README.md +++ b/incubator/haproxy-ingress/README.md @@ -99,7 +99,7 @@ Parameter | Description | Default `controller.nodeSelector` | to control scheduling | `{}` `controller.service.annotations` | annotations for controller service | `{}` `controller.service.labels` | labels for controller service | `{}` -`controller.service.clusterIP` | internal controller cluster service IP | `""` +`controller.service.clusterIP` | internal controller cluster service IP | `nil` `controller.service.externalTrafficPolicy` | If `controller.service.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable [source IP preservation](https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typenodeport) | `Local` `controller.service.externalIPs` | list of IP addresses at which the controller services are available | `[]` `controller.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` @@ -110,7 +110,7 @@ Parameter | Description | Default `controller.stats.enabled` | whether to enable exporting stats | `false` `controller.stats.port` | The port number used haproxy-ingress-controller for haproxy statistics | `1936` `controller.stats.service.annotations` | annotations for stats service | `{}` -`controller.stats.service.clusterIP` | internal stats cluster service IP | `""` +`controller.stats.service.clusterIP` | internal stats cluster service IP | `nil` `controller.stats.service.externalIPs` | list of IP addresses at which the stats service is available | `[]` `controller.stats.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` `controller.stats.service.loadBalancerSourceRanges` | | `[]` @@ -123,7 +123,7 @@ Parameter | Description | Default `controller.metrics.extraArgs` | Extra arguments to the haproxy_exporter | `{}` `controller.metrics.resources` | prometheus-exporter container resource requests & limits | `{}` `controller.metrics.service.annotations` | annotations for metrics service | `{}` -`controller.metrics.service.clusterIP` | internal metrics cluster service IP | `""` +`controller.metrics.service.clusterIP` | internal metrics cluster service IP | `nil` `controller.metrics.service.externalIPs` | list of IP addresses at which the metrics service is available | `[]` `controller.metrics.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` `controller.metrics.service.loadBalancerSourceRanges` | | `[]` @@ -151,7 +151,7 @@ Parameter | Description | Default `defaultBackend.resources.limits.memory` | default backend memory resources limit | `20Mi` `defaultBackend.service.name` | name of default backend service to create | `ingress-default-backend` `defaultBackend.service.annotations` | annotations for metrics service | `{}` -`defaultBackend.service.clusterIP` | internal metrics cluster service IP | `""` +`defaultBackend.service.clusterIP` | internal metrics cluster service IP | `nil` `defaultBackend.service.externalIPs` | list of IP addresses at which the metrics service is available | `[]` `defaultBackend.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` `defaultBackend.service.loadBalancerSourceRanges` | | `[]` diff --git a/incubator/haproxy-ingress/templates/controller-metrics-service.yaml b/incubator/haproxy-ingress/templates/controller-metrics-service.yaml index 2da9cd6017..6157ba0479 100644 --- a/incubator/haproxy-ingress/templates/controller-metrics-service.yaml +++ b/incubator/haproxy-ingress/templates/controller-metrics-service.yaml @@ -15,7 +15,9 @@ metadata: name: {{ template "haproxy-ingress.controller.fullname" . }}-metrics namespace: {{ .Release.Namespace }} spec: +{{- if .Values.controller.metrics.service.clusterIP }} clusterIP: "{{ .Values.controller.metrics.service.clusterIP }}" +{{- end }} {{- if .Values.controller.metrics.service.externalIPs }} externalIPs: {{ toYaml .Values.controller.metrics.service.externalIPs | indent 4 }} diff --git a/incubator/haproxy-ingress/templates/controller-stats-service.yaml b/incubator/haproxy-ingress/templates/controller-stats-service.yaml index 6b5bb8ee3d..f01bd82f73 100644 --- a/incubator/haproxy-ingress/templates/controller-stats-service.yaml +++ b/incubator/haproxy-ingress/templates/controller-stats-service.yaml @@ -15,7 +15,9 @@ metadata: name: {{ template "haproxy-ingress.controller.fullname" . }}-stats namespace: {{ .Release.Namespace }} spec: +{{- if .Values.controller.stats.service.clusterIP }} clusterIP: "{{ .Values.controller.stats.service.clusterIP }}" +{{- end }} {{- if .Values.controller.stats.service.externalIPs }} externalIPs: {{ toYaml .Values.controller.stats.service.externalIPs | indent 4 }}