Merge branch 'main' into quickwit-oss-helm-chart-91

quickwit-oss · Jul 11, 2024 · 3cc940a · 3cc940a
2 parents ad9371e + 86f1b3d
commit 3cc940a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/charts/quickwit/templates/service.yaml b/charts/quickwit/templates/service.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.searcher.serviceType | default .Values.service.type }}
   {{- if .Values.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
   {{- end }}
@@ -80,7 +80,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.indexer.serviceType | default .Values.service.type }}
   {{- if .Values.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
   {{- end }}
@@ -112,7 +112,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.metastore.serviceType | default .Values.service.type }}
   {{- if .Values.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
   {{- end }}
@@ -136,8 +136,15 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-control-plane
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+  annotations:
+    {{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with .Values.control_plane.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.control_plane.serviceType | default .Values.service.type }}
   {{- if .Values.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
   {{- end }}
@@ -162,8 +169,15 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-janitor
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+  annotations:
+    {{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with .Values.janitor.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.janitor.serviceType | default .Values.service.type }}
   {{- if .Values.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
   {{- end }}

diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
@@ -117,6 +117,8 @@ searcher:
 
   serviceAnnotations: {}
 
+  # serviceType: ClusterIP
+
   nodeSelector: {}
 
   tolerations: []
@@ -186,6 +188,8 @@ indexer:
 
   serviceAnnotations: {}
 
+  # serviceType: ClusterIP
+
   nodeSelector: {}
 
   tolerations: []
@@ -256,6 +260,8 @@ metastore:
 
   serviceAnnotations: {}
 
+  # serviceType: ClusterIP
+
   nodeSelector: {}
 
   tolerations: []
@@ -313,6 +319,10 @@ control_plane:
 
   podAnnotations: {}
 
+  serviceAnnotations: {}
+
+  # serviceType: ClusterIP
+
   nodeSelector: {}
 
   tolerations: []
@@ -373,6 +383,10 @@ janitor:
 
   podAnnotations: {}
 
+  serviceAnnotations: {}
+
+  # serviceType: ClusterIP
+
   nodeSelector: {}
 
   tolerations: []
@@ -551,6 +565,7 @@ prometheusRule:
   #      severity: warning
 
 service:
+  # Service type configuration default for all Quickwit services
   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)