From 781e4bdca1badd6805267c7dd6a534cc8be486f1 Mon Sep 17 00:00:00 2001
From: Mikael Bergemalm <mbergemalm@gmail.com>
Date: Thu, 19 Dec 2024 15:33:10 +0100
Subject: [PATCH] feat(helm): support dual-stack networking for load balancers

---
 install/helm/agones/templates/ping.yaml              | 12 ++++++++++++
 .../helm/agones/templates/service/allocation.yaml    |  6 ++++++
 install/helm/agones/values.yaml                      | 12 ++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/install/helm/agones/templates/ping.yaml b/install/helm/agones/templates/ping.yaml
index d3c0ad4014..c2fe7179b2 100644
--- a/install/helm/agones/templates/ping.yaml
+++ b/install/helm/agones/templates/ping.yaml
@@ -158,6 +158,12 @@ metadata:
 spec:
   selector:
     agones.dev/role: ping
+{{- if .Values.agones.ping.http.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.agones.ping.http.ipFamilyPolicy }}
+{{- end }}
+{{- if .Values.agones.ping.http.ipFamilies }}
+  ipFamilies: {{ toYaml .Values.agones.ping.http.ipFamilies | nindent 4 }}
+{{- end }}
   ports:
     - port: {{ .Values.agones.ping.http.port }}
       name: http
@@ -198,6 +204,12 @@ metadata:
 spec:
   selector:
     agones.dev/role: ping
+{{- if .Values.agones.ping.udp.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.agones.ping.udp.ipFamilyPolicy }}
+{{- end }}
+{{- if .Values.agones.ping.udp.ipFamilies }}
+  ipFamilies: {{ toYaml .Values.agones.ping.udp.ipFamilies | nindent 4 }}
+{{- end }}
   ports:
     - port: {{ .Values.agones.ping.udp.port }}
       name: udp
diff --git a/install/helm/agones/templates/service/allocation.yaml b/install/helm/agones/templates/service/allocation.yaml
index 8c538029f8..766f2fef78 100644
--- a/install/helm/agones/templates/service/allocation.yaml
+++ b/install/helm/agones/templates/service/allocation.yaml
@@ -33,6 +33,12 @@ metadata:
 spec:
   selector:
     multicluster.agones.dev/role: allocator
+{{- if .Values.agones.allocator.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.agones.allocator.service.ipFamilyPolicy }}
+{{- end }}
+{{- if .Values.agones.allocator.service.ipFamilies }}
+  ipFamilies: {{ toYaml .Values.agones.allocator.service.ipFamilies | nindent 4 }}
+{{- end }}
   ports:
 {{- if .Values.agones.allocator.service.http.enabled }}
     - port: {{ .Values.agones.allocator.service.http.port }}
diff --git a/install/helm/agones/values.yaml b/install/helm/agones/values.yaml
index 85d1ea9ac2..c8f45c4e7a 100644
--- a/install/helm/agones/values.yaml
+++ b/install/helm/agones/values.yaml
@@ -186,6 +186,10 @@ agones:
       loadBalancerIP: ""
       loadBalancerSourceRanges: []
       annotations: {}
+      # ipFamilyPolicy: RequireDualStack
+      # ipFamilies:
+      # - IPv4
+      # - IPv6
     udp:
       expose: true
       rateLimit: 20
@@ -195,6 +199,10 @@ agones:
       loadBalancerIP: ""
       loadBalancerSourceRanges: []
       annotations: {}
+      # ipFamilyPolicy: RequireDualStack
+      # ipFamilies:
+      # - IPv4
+      # - IPv6
     healthCheck:
       initialDelaySeconds: 3
       periodSeconds: 3
@@ -238,6 +246,10 @@ agones:
       loadBalancerIP: ""
       loadBalancerSourceRanges: []
       annotations: {}
+      # ipFamilyPolicy: RequireDualStack
+      # ipFamilies:
+      # - IPv4
+      # - IPv6
       http:
         enabled: true
         appProtocol: ""