Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions charts/quickwit/ci/nodePort-custom-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
searcher:
serviceType: NodePort
restNodePort: 37280
grpcNodePort: 37281

indexer:
serviceType: NodePort
restNodePort: 37283
grpcNodePort: 37284

metastore:
serviceType: NodePort
restNodePort: 37285
grpcNodePort: 37286

control_plane:
serviceType: NodePort
restNodePort: 37287
grpcNodePort: 37288
2 changes: 2 additions & 0 deletions charts/quickwit/ci/nodePort-simple-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
service:
type: NodePort
24 changes: 24 additions & 0 deletions charts/quickwit/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@ spec:
targetPort: rest
protocol: TCP
name: rest
{{- if and (or (eq (.Values.searcher.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.searcher.restNodePort }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we break this down so it's easier to read?

{{- $type := .Values.indexer.serviceType | default .Values.service.type }}
{{- if and (eq $type "NodePort") .Values.indexer.restNodePort }}
  nodePort: {{ .Values.indexer.restNodePort }}
{{- end }}

nodePort: {{ .Values.searcher.restNodePort }}
{{- end }}
- port: 7281
targetPort: grpc
name: grpc
{{- if and (or (eq (.Values.searcher.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.searcher.grpcNodePort }}
nodePort: {{ .Values.searcher.restNodePort }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
nodePort: {{ .Values.searcher.restNodePort }}
nodePort: {{ .Values.searcher.grpcNodePort }}

{{- end }}
selector:
{{- include "quickwit.searcher.selectorLabels" . | nindent 4 }}
---
Expand Down Expand Up @@ -92,9 +98,15 @@ spec:
targetPort: rest
protocol: TCP
name: rest
{{- if and (or (eq (.Values.indexer.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.indexer.restNodePort }}
nodePort: {{ .Values.indexer.restNodePort }}
{{- end }}
- port: 7281
targetPort: grpc
name: grpc
{{- if and (or (eq (.Values.indexer.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.indexer.grpcNodePort }}
nodePort: {{ .Values.indexer.grpcNodePort }}
{{- end }}
selector:
{{- include "quickwit.indexer.selectorLabels" . | nindent 4 }}
---
Expand Down Expand Up @@ -124,9 +136,15 @@ spec:
targetPort: rest
protocol: TCP
name: rest
{{- if and (or (eq (.Values.metastore.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.metastore.restNodePort }}
nodePort: {{ .Values.metastore.restNodePort }}
{{- end }}
- port: 7281
targetPort: grpc
name: grpc
{{- if and (or (eq (.Values.metastore.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.metastore.grpcNodePort }}
nodePort: {{ .Values.metastore.grpcNodePort }}
{{- end }}
selector:
{{- include "quickwit.metastore.selectorLabels" . | nindent 4 }}
---
Expand Down Expand Up @@ -156,9 +174,15 @@ spec:
targetPort: rest
protocol: TCP
name: rest
{{- if and (or (eq (.Values.control_plane.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.control_plane.restNodePort }}
nodePort: {{ .Values.control_plane.restNodePort }}
{{- end }}
- port: 7281
targetPort: grpc
name: grpc
{{- if and (or (eq (.Values.control_plane.serviceType | default .Values.service.type) "NodePort") (eq .Values.service.type "NodePort")) .Values.control_plane.grpcNodePort }}
nodePort: {{ .Values.control_plane.grpcNodePort }}
{{- end }}
selector:
{{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}

Expand Down