From b184567913f638575744761e1f091c3b3a3481f8 Mon Sep 17 00:00:00 2001
From: Ludovic Ortega <ludovic.ortega@adminafk.fr>
Date: Thu, 9 May 2024 16:34:10 +0200
Subject: [PATCH] feat: add support for dual stack clusters

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
---
 charts/quickwit/Chart.yaml             |  2 +-
 charts/quickwit/templates/service.yaml | 36 ++++++++++++++++++++++++++
 charts/quickwit/values.yaml            |  5 ++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 08f7167..c0f3d1a 100644
--- a/charts/quickwit/Chart.yaml
+++ b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.5.15
+version: 0.5.16
 appVersion: "v0.8.1"
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/service.yaml b/charts/quickwit/templates/service.yaml
index cdb0d5c..bffb46a 100644
--- a/charts/quickwit/templates/service.yaml
+++ b/charts/quickwit/templates/service.yaml
@@ -13,6 +13,12 @@ metadata:
     {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   ports:
     - port: 7280
       targetPort: rest
@@ -36,6 +42,12 @@ metadata:
     {{- end }}
 spec:
   type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   clusterIP: None
   publishNotReadyAddresses: true
   ports:
@@ -69,6 +81,12 @@ metadata:
     {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   ports:
     - port: 7280
       targetPort: rest
@@ -95,6 +113,12 @@ metadata:
     {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   ports:
     - port: 7280
       targetPort: rest
@@ -114,6 +138,12 @@ metadata:
     {{- include "quickwit.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   ports:
     - port: 7280
       targetPort: rest
@@ -134,6 +164,12 @@ metadata:
     {{- include "quickwit.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   ports:
     - port: 7280
       targetPort: rest
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index d651c64..540694c 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -426,6 +426,11 @@ prometheusRule:
 service:
   type: ClusterIP
 
+  # -- Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)
+  ipFamilyPolicy: ""
+  # -- Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.
+  ipFamilies: []
+
   annotations: {}
 
 ingress: