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 2ca27edf07 make pinot k8s sts and deployment start command
configurable (#10509)
2ca27edf07 is described below
commit 2ca27edf074fc82b100d6d61065a314e1a89e12b
Author: Haitao Zhang <[email protected]>
AuthorDate: Wed Mar 29 21:48:12 2023 -0700
make pinot k8s sts and deployment start command configurable (#10509)
---
kubernetes/helm/pinot/templates/broker/statefulset.yaml | 2 +-
kubernetes/helm/pinot/templates/controller/statefulset.yaml | 2 +-
kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml | 2 +-
kubernetes/helm/pinot/templates/minion/statefulset.yaml | 2 +-
kubernetes/helm/pinot/templates/server/statefulset.yaml | 2 +-
kubernetes/helm/pinot/values.yaml | 5 +++++
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/kubernetes/helm/pinot/templates/broker/statefulset.yaml
b/kubernetes/helm/pinot/templates/broker/statefulset.yaml
index f53ce57d35..6c372b249a 100644
--- a/kubernetes/helm/pinot/templates/broker/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/broker/statefulset.yaml
@@ -60,7 +60,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [
- "StartBroker",
+ "{{ .Values.broker.startCommand }}",
"-clusterName", "{{ .Values.cluster.name }}",
"-zkAddress", {{ include "zookeeper.url" . | quote }},
"-configFileName", "/var/pinot/broker/config/pinot-broker.conf"
diff --git a/kubernetes/helm/pinot/templates/controller/statefulset.yaml
b/kubernetes/helm/pinot/templates/controller/statefulset.yaml
index baf6229b5d..8c6cab5fcb 100644
--- a/kubernetes/helm/pinot/templates/controller/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/controller/statefulset.yaml
@@ -59,7 +59,7 @@ spec:
{{- toYaml .Values.controller.securityContext | nindent 10 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
- args: [ "StartController", "-configFileName",
"/var/pinot/controller/config/pinot-controller.conf" ]
+ args: [ "{{ .Values.controller.startCommand }}", "-configFileName",
"/var/pinot/controller/config/pinot-controller.conf" ]
env:
- name: JAVA_OPTS
value: "{{ .Values.controller.jvmOpts }}
-Dlog4j2.configurationFile={{ .Values.controller.log4j2ConfFile }}
-Dplugins.dir={{ .Values.controller.pluginsDir }}"
diff --git a/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
b/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
index 1f286f7a80..1be2f4222d 100644
--- a/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
+++ b/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
@@ -56,7 +56,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [
- "StartMinion",
+ "{{ .Values.minionStateless.startCommand }}",
"-clusterName", "{{ .Values.cluster.name }}",
"-zkAddress", {{ include "zookeeper.url" . | quote }},
"-configFileName",
"/var/pinot/minion/config/pinot-minion-stateless.conf"
diff --git a/kubernetes/helm/pinot/templates/minion/statefulset.yaml
b/kubernetes/helm/pinot/templates/minion/statefulset.yaml
index db43b87ded..00b697a24d 100644
--- a/kubernetes/helm/pinot/templates/minion/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/minion/statefulset.yaml
@@ -61,7 +61,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [
- "StartMinion",
+ "{{ .Values.minion.startCommand }}",
"-clusterName", "{{ .Values.cluster.name }}",
"-zkAddress", {{ include "zookeeper.url" . | quote }},
"-configFileName", "/var/pinot/minion/config/pinot-minion.conf"
diff --git a/kubernetes/helm/pinot/templates/server/statefulset.yaml
b/kubernetes/helm/pinot/templates/server/statefulset.yaml
index 1d80e9bdd0..136d7367d7 100644
--- a/kubernetes/helm/pinot/templates/server/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/server/statefulset.yaml
@@ -60,7 +60,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [
- "StartServer",
+ "{{ .Values.server.startCommand }}",
"-clusterName", "{{ .Values.cluster.name }}",
"-zkAddress", {{ include "zookeeper.url" . | quote }},
"-configFileName", "/var/pinot/server/config/pinot-server.conf"
diff --git a/kubernetes/helm/pinot/values.yaml
b/kubernetes/helm/pinot/values.yaml
index 54aaa638d1..54cd0449cf 100644
--- a/kubernetes/helm/pinot/values.yaml
+++ b/kubernetes/helm/pinot/values.yaml
@@ -76,6 +76,7 @@ controller:
podSecurityContext: {}
# fsGroup: 2000
securityContext: {}
+ startCommand: "StartController"
probes:
endpoint: "/health"
@@ -185,6 +186,7 @@ broker:
podSecurityContext: {}
# fsGroup: 2000
securityContext: {}
+ startCommand: "StartBroker"
jvmOpts: "-XX:ActiveProcessorCount=2 -Xms256M -Xmx1G -XX:+UseG1GC
-XX:MaxGCPauseMillis=200 -Xlog:gc*:file=/opt/pinot/gc-pinot-broker.log"
@@ -284,6 +286,7 @@ server:
podSecurityContext: {}
# fsGroup: 2000
securityContext: {}
+ startCommand: "StartServer"
probes:
endpoint: "/health"
@@ -372,6 +375,7 @@ minion:
podSecurityContext: {}
# fsGroup: 2000
securityContext: {}
+ startCommand: "StartMinion"
probes:
endpoint: "/health"
@@ -454,6 +458,7 @@ minionStateless:
podSecurityContext: {}
# fsGroup: 2000
securityContext: {}
+ startCommand: "StartMinion"
probes:
endpoint: "/health"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
