You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2023/05/11 21:28:04 UTC
[pinot] branch master updated: Add opt ports to helm (#10540)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 02d2390d6e Add opt ports to helm (#10540)
02d2390d6e is described below
commit 02d2390d6e31bc5885fc43054d31a4c435f0784a
Author: psheets <40...@users.noreply.github.com>
AuthorDate: Thu May 11 17:27:57 2023 -0400
Add opt ports to helm (#10540)
* init and add extraPort
* remove build
* add broker extra ports
* add broker extra ports
* added if statements per PR comments.
---
.../pinot/templates/broker/service-headless.yaml | 6 ++++++
.../helm/pinot/templates/broker/service.yaml | 6 ++++++
.../helm/pinot/templates/broker/statefulset.yaml | 3 +++
.../templates/controller/service-headless.yaml | 6 ++++++
.../helm/pinot/templates/controller/service.yaml | 6 ++++++
.../pinot/templates/controller/statefulset.yaml | 3 +++
.../templates/minion-stateless/deployment.yaml | 3 +++
.../pinot/templates/minion/service-headless.yaml | 6 ++++++
.../helm/pinot/templates/minion/service.yaml | 6 ++++++
.../helm/pinot/templates/minion/statefulset.yaml | 3 +++
.../pinot/templates/server/service-headless.yaml | 7 +++++++
.../helm/pinot/templates/server/service.yaml | 6 ++++++
.../helm/pinot/templates/server/statefulset.yaml | 3 +++
kubernetes/helm/pinot/values.yaml | 22 +++++++++++++++++++++-
14 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/kubernetes/helm/pinot/templates/broker/service-headless.yaml b/kubernetes/helm/pinot/templates/broker/service-headless.yaml
index 1c8ad71e72..ab537bf57e 100644
--- a/kubernetes/helm/pinot/templates/broker/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/broker/service-headless.yaml
@@ -29,5 +29,11 @@ spec:
# [pod_name].[service_name].[namespace].svc.cluster.local
- name: {{ .Values.broker.service.name }}
port: {{ .Values.broker.service.port }}
+ {{- if .Values.broker.service.extraPorts }}
+ {{- range .Values.broker.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.brokerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/broker/service.yaml b/kubernetes/helm/pinot/templates/broker/service.yaml
index bd0f4a5db0..2f441fdaf5 100644
--- a/kubernetes/helm/pinot/templates/broker/service.yaml
+++ b/kubernetes/helm/pinot/templates/broker/service.yaml
@@ -31,5 +31,11 @@ spec:
# [pod_name].[service_name].[namespace].svc.cluster.local
- name: {{ .Values.broker.service.name }}
port: {{ .Values.broker.service.port }}
+ {{- if .Values.broker.service.extraPorts }}
+ {{- range .Values.broker.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.brokerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/broker/statefulset.yaml b/kubernetes/helm/pinot/templates/broker/statefulset.yaml
index 6c372b249a..de69c0408f 100644
--- a/kubernetes/helm/pinot/templates/broker/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/broker/statefulset.yaml
@@ -77,6 +77,9 @@ spec:
- containerPort: {{ .Values.broker.service.port }}
protocol: {{ .Values.broker.service.protocol }}
name: {{ .Values.broker.service.name }}
+{{- if .Values.broker.service.extraPorts }}
+{{ toYaml .Values.broker.service.extraPorts | indent 10 }}
+{{- end }}
volumeMounts:
- name: config
mountPath: /var/pinot/broker/config
diff --git a/kubernetes/helm/pinot/templates/controller/service-headless.yaml b/kubernetes/helm/pinot/templates/controller/service-headless.yaml
index bb64490c3c..1b1f5f47cc 100644
--- a/kubernetes/helm/pinot/templates/controller/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/controller/service-headless.yaml
@@ -29,5 +29,11 @@ spec:
# [pod_name].[service_name].[namespace].svc.cluster.local
- name: {{ .Values.controller.service.name }}
port: {{ .Values.controller.service.port }}
+ {{- if .Values.controller.service.extraPorts }}
+ {{- range .Values.controller.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.controllerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/controller/service.yaml b/kubernetes/helm/pinot/templates/controller/service.yaml
index 8e0cba9bf2..7453142e12 100644
--- a/kubernetes/helm/pinot/templates/controller/service.yaml
+++ b/kubernetes/helm/pinot/templates/controller/service.yaml
@@ -31,5 +31,11 @@ spec:
# [pod_name].[service_name].[namespace].svc.cluster.local
- name: {{ .Values.controller.service.name }}
port: {{ .Values.controller.service.port }}
+ {{- if .Values.controller.service.extraPorts }}
+ {{- range .Values.controller.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.controllerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/controller/statefulset.yaml b/kubernetes/helm/pinot/templates/controller/statefulset.yaml
index 8c6cab5fcb..8b652b301e 100644
--- a/kubernetes/helm/pinot/templates/controller/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/controller/statefulset.yaml
@@ -72,6 +72,9 @@ spec:
- containerPort: {{ .Values.controller.service.port }}
protocol: {{ .Values.controller.service.protocol }}
name: {{ .Values.controller.service.name }}
+{{- if .Values.controller.service.extraPorts }}
+{{ toYaml .Values.controller.service.extraPorts | indent 10 }}
+{{- end }}
{{- if .Values.controller.probes.livenessEnabled }}
livenessProbe:
initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml b/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
index 1be2f4222d..16907369ff 100644
--- a/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
+++ b/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
@@ -73,6 +73,9 @@ spec:
- containerPort: {{ .Values.minionStateless.service.port }}
protocol: {{ .Values.minionStateless.service.protocol }}
name: {{ .Values.minionStateless.service.name }}
+{{- if .Values.minionStateless.service.extraPorts }}
+{{ toYaml .Values.minionStateless.service.extraPorts | indent 10 }}
+{{- end }}
{{- if .Values.minionStateless.probes.livenessEnabled }}
livenessProbe:
initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/templates/minion/service-headless.yaml b/kubernetes/helm/pinot/templates/minion/service-headless.yaml
index 120042b8b1..5673b9ac2d 100644
--- a/kubernetes/helm/pinot/templates/minion/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/minion/service-headless.yaml
@@ -30,6 +30,12 @@ spec:
# [pod_name].[service_name].[namespace].svc.cluster.local
- name: {{ .Values.minion.service.name }}
port: {{ .Values.minion.service.port }}
+ {{- if .Values.minion.service.extraPorts }}
+ {{- range .Values.minion.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.minionMatchLabels" . | nindent 4 }}
{{- end }}
diff --git a/kubernetes/helm/pinot/templates/minion/service.yaml b/kubernetes/helm/pinot/templates/minion/service.yaml
index d4f61d982d..4fc88fd288 100644
--- a/kubernetes/helm/pinot/templates/minion/service.yaml
+++ b/kubernetes/helm/pinot/templates/minion/service.yaml
@@ -32,6 +32,12 @@ spec:
# [pod_name].[service_name].[namespace].svc.cluster.local
- name: {{ .Values.minion.service.name }}
port: {{ .Values.minion.service.port }}
+ {{- if .Values.minion.service.extraPorts }}
+ {{- range .Values.minion.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.minionMatchLabels" . | nindent 4 }}
{{- end }}
diff --git a/kubernetes/helm/pinot/templates/minion/statefulset.yaml b/kubernetes/helm/pinot/templates/minion/statefulset.yaml
index 00b697a24d..443056dacf 100644
--- a/kubernetes/helm/pinot/templates/minion/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/minion/statefulset.yaml
@@ -78,6 +78,9 @@ spec:
- containerPort: {{ .Values.minion.service.port }}
protocol: {{ .Values.minion.service.protocol }}
name: {{ .Values.minion.service.name }}
+{{- if .Values.minion.service.extraPorts }}
+{{ toYaml .Values.minion.service.extraPorts | indent 10 }}
+{{- end }}
{{- if .Values.minion.probes.livenessEnabled }}
livenessProbe:
initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/templates/server/service-headless.yaml b/kubernetes/helm/pinot/templates/server/service-headless.yaml
index 5ccfcd56b1..fe558e4143 100644
--- a/kubernetes/helm/pinot/templates/server/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/server/service-headless.yaml
@@ -34,5 +34,12 @@ spec:
port: {{ .Values.server.service.adminExposePort }}
targetPort: {{ .Values.server.service.adminPort }}
protocol: {{ .Values.server.service.protocol }}
+ {{- if .Values.server.service.extraPorts }}
+ {{- range .Values.server.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ protocol: {{ .protocol }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.serverMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/server/service.yaml b/kubernetes/helm/pinot/templates/server/service.yaml
index c93dfd01fa..298470c956 100644
--- a/kubernetes/helm/pinot/templates/server/service.yaml
+++ b/kubernetes/helm/pinot/templates/server/service.yaml
@@ -36,5 +36,11 @@ spec:
port: {{ .Values.server.service.adminExposePort }}
targetPort: {{ .Values.server.service.adminPort }}
protocol: {{ .Values.server.service.protocol }}
+ {{- if .Values.server.service.extraPorts }}
+ {{- range .Values.server.service.extraPorts }}
+ - name: {{ .name }}
+ port: {{ .containerPort }}
+ {{- end }}
+ {{- end }}
selector:
{{- include "pinot.serverMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/server/statefulset.yaml b/kubernetes/helm/pinot/templates/server/statefulset.yaml
index 136d7367d7..ea2de5785e 100644
--- a/kubernetes/helm/pinot/templates/server/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/server/statefulset.yaml
@@ -80,6 +80,9 @@ spec:
- containerPort: {{ .Values.server.service.adminPort }}
protocol: {{ .Values.server.service.protocol }}
name: {{ .Values.server.service.adminPortName }}
+{{- if .Values.server.service.extraPorts }}
+{{ toYaml .Values.server.service.extraPorts | indent 10 }}
+{{- end }}
{{- if .Values.server.probes.livenessEnabled }}
livenessProbe:
initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/values.yaml b/kubernetes/helm/pinot/values.yaml
index 54cd0449cf..9060a20037 100644
--- a/kubernetes/helm/pinot/values.yaml
+++ b/kubernetes/helm/pinot/values.yaml
@@ -116,6 +116,10 @@ controller:
nodePort: ""
protocol: TCP
name: controller
+ extraPorts: []
+ # - containerPort: 1234
+ # protocol: PROTOCOL
+ # name: extra-port
external:
enabled: true
@@ -216,6 +220,10 @@ broker:
port: 8099
name: broker
nodePort: ""
+ extraPorts: []
+ # - containerPort: 1234
+ # protocol: PROTOCOL
+ # name: extra-port
external:
enabled: true
@@ -325,6 +333,10 @@ server:
adminPortName: admin
nodePort: ""
protocol: TCP
+ extraPorts: []
+ # - containerPort: 1234
+ # protocol: PROTOCOL
+ # name: extra-port
resources:
requests:
@@ -409,6 +421,10 @@ minion:
nodePort: ""
protocol: TCP
name: minion
+ extraPorts: []
+ # - containerPort: 1234
+ # protocol: PROTOCOL
+ # name: extra-port
resources:
requests:
@@ -486,7 +502,11 @@ minionStateless:
port: 9514
protocol: TCP
name: minion
-
+ extraPorts: []
+ # - containerPort: 1234
+ # protocol: PROTOCOL
+ # name: extra-port
+
resources:
requests:
memory: "1.25Gi"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org