Add support for HAProxy service externalIPs

- fix haproxy.image.serviceAccountName to haproxy.serviceAccountName in README.md - add missing haproxy.service.loadBalancerIP entry - add new haproxy.service.externalIPs Signed-off-by: Martin Fleurke <[email protected]>
DandyDeveloper · Jul 10, 2023 · 53402e0 · 53402e0
1 parent bb6cb8f
commit 53402e0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 4.23.0
+version: 4.24.0
 appVersion: 7.0.9
 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png

diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md
@@ -176,12 +176,14 @@ The following table lists the configurable parameters of the Redis chart and the
 | `haproxy.resources`       | HAProxy resources                                                                                                                                                                                        | `{}`                                                                                       |
 | `haproxy.emptyDir`        | Configuration of `emptyDir`                                                                                                                                  | `{}`                                                                                       |
 | `haproxy.labels`          | Labels for the HAProxy pod                                                                                                                                  | `{}`                                                                                       |
+| `haproxy.serviceAccountName`| HAProxy serviceAccountName                                                                                                                                                                                 | `default`
 | `haproxy.service.type`                 | HAProxy service type "ClusterIP", "LoadBalancer" or "NodePort"                                                                                                                              | `ClusterIP`                                                                                |
 | `haproxy.service.nodePort`             | HAProxy service nodePort value (haproxy.service.type must be NodePort)                                                                                                                      | not set                                                                                    |
-| `haproxy.image.serviceAccountName`| HAProxy serviceAccountName                                                                                                                                                                                 | `default`  
 | `haproxy.service.externalTrafficPolicy`| HAProxy service externalTrafficPolicy value (haproxy.service.type must be LoadBalancer)                                                                                                     | not set                                                                                    |
 | `haproxy.service.annotations`          | HAProxy service annotations                                                                                                                                                                 | `{}`                                                                                       |
 | `haproxy.service.labels`          | HAProxy service labels                                                                                                                                                                | `{}`                                                                                       |
+| `haproxy.service.loadBalancerIP`  | HAProxy service loadbalancer IP                                                                                                                                                       | not set                                                                                                                               |
+| `haproxy.service.externalIPs`     | HAProxy external IPs                                                                                                                                                                  | `{}`                                                                                                                                  |
 | `haproxy.stickyBalancing` | HAProxy sticky load balancing to Redis nodes. Helps with connections shutdown.                                                                                                                           | `false`                                                                                    |
 | `haproxy.hapreadport.enable`  | Enable a read only port for redis slaves                                                                                                                                                             | `false`                                                                                    |
 | `haproxy.hapreadport.port`    | Haproxy port for read only redis slaves                                                                                                                                                              | `6380`                                                                                     |

diff --git a/charts/redis-ha/templates/redis-haproxy-service.yaml b/charts/redis-ha/templates/redis-haproxy-service.yaml
@@ -28,6 +28,12 @@ spec:
   {{- if and (eq .Values.haproxy.service.type "LoadBalancer") .Values.haproxy.service.loadBalancerSourceRanges }}
   loadBalancerSourceRanges: {{ toYaml .Values.haproxy.service.loadBalancerSourceRanges | nindent 2 }}
   {{- end }}
+  {{- if .Values.haproxy.service.externalIPs }}
+  externalIPs:
+    {{- range $key, $value := .Values.haproxy.service.externalIPs }}
+    - {{ $value }}
+    {{- end }}
+  {{- end }}
   ports:
   - name: tcp-haproxy
     port: {{ .Values.haproxy.servicePort }}

diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml
@@ -116,6 +116,7 @@ haproxy:
   service:
     type: ClusterIP
     loadBalancerIP:
+    externalIPs: {}
     labels: {}
     annotations: null