From be19ab879ee21315aaa513599f0db24bcfc075a9 Mon Sep 17 00:00:00 2001 From: Olivier Boudet Date: Mon, 6 May 2024 16:27:40 +0200 Subject: [PATCH 1/3] [bitnami/haproxy] Add externalIPs (#25564) Signed-off-by: Olivier Boudet --- bitnami/haproxy/Chart.yaml | 2 +- bitnami/haproxy/README.md | 1 + bitnami/haproxy/templates/service.yaml | 3 +++ bitnami/haproxy/values.yaml | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bitnami/haproxy/Chart.yaml b/bitnami/haproxy/Chart.yaml index e8ba74ea2f4005..99f70f60faa246 100644 --- a/bitnami/haproxy/Chart.yaml +++ b/bitnami/haproxy/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: haproxy sources: - https://github.com/bitnami/charts/tree/main/bitnami/haproxy -version: 1.0.4 +version: 1.0.5 diff --git a/bitnami/haproxy/README.md b/bitnami/haproxy/README.md index 333ed353d8d8a6..e71f29b4291e59 100644 --- a/bitnami/haproxy/README.md +++ b/bitnami/haproxy/README.md @@ -208,6 +208,7 @@ As an alternative, use one of the preset configurations for pod affinity, pod an | `service.clusterIP` | haproxy service Cluster IP | `""` | | `service.loadBalancerIP` | haproxy service Load Balancer IP | `""` | | `service.loadBalancerSourceRanges` | haproxy service Load Balancer sources | `[]` | +| `service.externalIPs` | External IPs | `[]` | | `service.externalTrafficPolicy` | haproxy service external traffic policy | `Cluster` | | `service.annotations` | Additional custom annotations for haproxy service | `{}` | | `service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | diff --git a/bitnami/haproxy/templates/service.yaml b/bitnami/haproxy/templates/service.yaml index 65cadbe92a6559..bd66e1bfbcecc6 100644 --- a/bitnami/haproxy/templates/service.yaml +++ b/bitnami/haproxy/templates/service.yaml @@ -21,6 +21,9 @@ spec: {{- if .Values.service.clusterIP }} clusterIP: {{ .Values.service.clusterIP }} {{- end }} + {{- if .Values.service.externalIPs }} + externalIPs: {{- toYaml .Values.service.externalIPs | nindent 4 }} + {{- end }} {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }} externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }} {{- end }} diff --git a/bitnami/haproxy/values.yaml b/bitnami/haproxy/values.yaml index ebbb42b8fde47c..297a73dd7f99a1 100644 --- a/bitnami/haproxy/values.yaml +++ b/bitnami/haproxy/values.yaml @@ -101,6 +101,10 @@ service: ## @param service.externalTrafficPolicy haproxy service external traffic policy ## ref https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip ## + ## @param service.externalIPs [array] External IPs + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#external-ips + ## + externalIPs: [] externalTrafficPolicy: Cluster ## @param service.annotations Additional custom annotations for haproxy service ## From 48616a5589f01925ea86920d328afbbedd82f857 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Mon, 6 May 2024 14:29:07 +0000 Subject: [PATCH 2/3] Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --- bitnami/haproxy/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/haproxy/README.md b/bitnami/haproxy/README.md index e71f29b4291e59..ca320669793852 100644 --- a/bitnami/haproxy/README.md +++ b/bitnami/haproxy/README.md @@ -208,8 +208,8 @@ As an alternative, use one of the preset configurations for pod affinity, pod an | `service.clusterIP` | haproxy service Cluster IP | `""` | | `service.loadBalancerIP` | haproxy service Load Balancer IP | `""` | | `service.loadBalancerSourceRanges` | haproxy service Load Balancer sources | `[]` | -| `service.externalIPs` | External IPs | `[]` | | `service.externalTrafficPolicy` | haproxy service external traffic policy | `Cluster` | +| `service.externalIPs` | External IPs | `[]` | | `service.annotations` | Additional custom annotations for haproxy service | `{}` | | `service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | | `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | From 7ba4c935d163c740ced15f82c0b3969949d36796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Martos?= Date: Tue, 7 May 2024 15:58:06 +0200 Subject: [PATCH 3/3] Update bitnami/haproxy/Chart.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan José Martos --- bitnami/haproxy/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/haproxy/Chart.yaml b/bitnami/haproxy/Chart.yaml index 99f70f60faa246..f5ecf5ec5fa574 100644 --- a/bitnami/haproxy/Chart.yaml +++ b/bitnami/haproxy/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: haproxy sources: - https://github.com/bitnami/charts/tree/main/bitnami/haproxy -version: 1.0.5 +version: 1.1.0