Skip to content

This PR adds small Helm chart improvements for deployment flexibility while keeping backward compatibility by default #18793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidballano wants to merge 2 commits into
base: master
Choose a base branch
from
+50 −5
Open

This PR adds small Helm chart improvements for deployment flexibility while keeping backward compatibility by default #18793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c85377f
helm: add namespace creation and workload configuration knobs
Jun 17, 2026
22df244
helm: apply workload annotations and minion image overrides
Jun 17, 2026
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
1 change: 1 addition & 0 deletions helm/pinot/templates/broker/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ metadata:
namespace: {{ include "pinot.namespace" . }}
labels:
{{- include "pinot.brokerLabels" . | nindent 4 }}
annotations: {{ toYaml .Values.broker.annotations | nindent 4 }}
spec:
selector:
matchLabels:
Expand Down
3 changes: 2 additions & 1 deletion helm/pinot/templates/controller/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ metadata:
namespace: {{ include "pinot.namespace" . }}
labels:
{{- include "pinot.controllerLabels" . | nindent 4 }}
annotations: {{ toYaml .Values.controller.annotations | nindent 4 }}
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -65,7 +66,7 @@ spec:
- name: controller
securityContext:
{{- toYaml .Values.controller.securityContext | nindent 10 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.minionImage.repository | default .Values.image.repository }}:{{ .Values.minionImage.tag | default .Values.image.tag }}"

@xiangfu0 xiangfu0 Jun 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why use minionImage for controller?

@davidballano davidballano Jun 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

If I remember correctly Minions and controller are tied together, so controller should know about new minions to properly schedule them for execution, it's ok to deploy the same custom image with minions to all components, we just isolated it so we can do deploy without rolling all servers (servers do not need to know about minion plugins)

imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [ "{{ .Values.controller.startCommand }}", "-configFileName", "/var/pinot/controller/config/pinot-controller.conf" ]
env:
Expand Down
3 changes: 2 additions & 1 deletion helm/pinot/templates/minion-stateless/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ metadata:
namespace: {{ include "pinot.namespace" . }}
labels:
{{- include "pinot.minionStatelessLabels" . | nindent 4 }}
annotations: {{ toYaml .Values.minionStateless.annotations | nindent 4 }}
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -57,7 +58,7 @@ spec:
- name: minion-stateless
securityContext:
{{- toYaml .Values.minionStateless.securityContext | nindent 10 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.minionImage.repository | default .Values.image.repository }}:{{ .Values.minionImage.tag | default .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [
"{{ .Values.minionStateless.startCommand }}",
Expand Down
3 changes: 2 additions & 1 deletion helm/pinot/templates/minion/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ metadata:
namespace: {{ include "pinot.namespace" . }}
labels:
{{- include "pinot.minionLabels" . | nindent 4 }}
annotations: {{ toYaml .Values.minion.annotations | nindent 4 }}
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -66,7 +67,7 @@ spec:
- name: minion
securityContext:
{{- toYaml .Values.minion.securityContext | nindent 10 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.minionImage.repository | default .Values.image.repository }}:{{ .Values.minionImage.tag | default .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [
"{{ .Values.minion.startCommand }}",
Expand Down
31 changes: 31 additions & 0 deletions helm/pinot/templates/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{{- if .Values.namespace.create }}
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

apiVersion: v1
kind: Namespace
metadata:
name: {{ include "pinot.namespace" . }}
labels:
{{- include "pinot.labels" . | nindent 4 }}
{{- with .Values.namespaceAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions helm/pinot/templates/server/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ metadata:
namespace: {{ include "pinot.namespace" . }}
data:
pinot-server.conf: |-
{{ if .Values.server.ConfigureServerPort }}
{{- if .Values.server.ConfigureServerPort }}
pinot.server.netty.port={{ .Values.server.service.nettyPort }}
pinot.server.adminapi.port={{ .Values.server.service.adminPort }}
{{ end }}
{{- end }}
pinot.server.instance.dataDir={{ .Values.server.dataDir }}
pinot.server.instance.segmentTarDir={{ .Values.server.segmentTarDir }}
{{ .Values.server.extra.configs | indent 4 }}
1 change: 1 addition & 0 deletions helm/pinot/templates/server/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ metadata:
namespace: {{ include "pinot.namespace" . }}
labels:
{{- include "pinot.serverLabels" . | nindent 4 }}
annotations: {{ toYaml .Values.server.annotations | nindent 4 }}
spec:
selector:
matchLabels:
Expand Down
9 changes: 9 additions & 0 deletions helm/pinot/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

# Default values for Pinot.

namespace:
create: false
namespaceOverride:
namespaceAnnotations: {}

Expand All @@ -35,6 +37,8 @@ image:
tag: latest # 1.0.0, 0.12.1, latest
pullPolicy: Always # Use IfNotPresent when you pinged a version of image tag

minionImage: {}

cluster:
name: pinot-quickstart

Expand Down Expand Up @@ -93,6 +97,7 @@ controller:
# you want to specify the port in controller.access.protocols.https.port instead.
configureControllerPort: true
replicaCount: 1
annotations: {}
podManagementPolicy: Parallel
podSecurityContext: {}
# fsGroup: 2000
Expand Down Expand Up @@ -245,6 +250,7 @@ broker:
# you want to specify the port in pinot.broker.access.protocols.https.port instead.
configureBrokerPort: true
replicaCount: 1
annotations: {}
podManagementPolicy: Parallel
podSecurityContext: {}
# fsGroup: 2000
Expand Down Expand Up @@ -389,6 +395,7 @@ server:
# you want to specify the port in pinot.server.nettytls.port instead.
configureServerPort: true
replicaCount: 1
annotations: {}
podManagementPolicy: Parallel
podSecurityContext: {}
# fsGroup: 2000
Expand Down Expand Up @@ -523,6 +530,7 @@ minion:
# or when you're configuring ports through another mechanism.
configureMinionPort: true
replicaCount: 0
annotations: {}
podManagementPolicy: Parallel
podSecurityContext: {}
# fsGroup: 2000
Expand Down Expand Up @@ -646,6 +654,7 @@ minionStateless:
# or when you're configuring ports through another mechanism.
configureMinionStatelessPort: true
replicaCount: 1
annotations: {}
podSecurityContext: {}
# fsGroup: 2000
securityContext: {}
Expand Down
Loading