Skip to content

[SPARK-53159] Declare metrics port for operator in helm chart #294

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

Closed
jiangzho wants to merge 1 commit into from
Closed

[SPARK-53159] Declare metrics port for operator in helm chart #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions build-tools/helm/spark-kubernetes-operator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ Default property overrides
spark.kubernetes.operator.namespace={{ .Release.Namespace }}
spark.kubernetes.operator.name={{- include "spark-operator.name" . }}
spark.kubernetes.operator.dynamicConfig.enabled={{ .Values.operatorConfiguration.dynamicConfig.enable }}
spark.kubernetes.operator.metrics.port={{ include "spark-operator.metricsPort" . }}
Copy link
Contributor

@peter-toth peter-toth Aug 7, 2025

Choose a reason for hiding this comment

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

Not related to this PR, but @jiangzho can you please check why spark.kubernetes.operator.health.probePort is not set here from spark-operator.probePort?

Copy link
Contributor Author

@jiangzho jiangzho Aug 7, 2025

Choose a reason for hiding this comment

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

Thanks for the catch!

Yes, we'll need to fix that as well when user override the port from Helm chart values. I'll track that over SPARK-53186

{{- if .Values.workloadResources.namespaces.overrideWatchedNamespaces }}
spark.kubernetes.operator.watchedNamespaces={{ include "spark-operator.workloadNamespacesStr" . | trim }}
{{- end }}
Expand Down Expand Up @@ -145,3 +146,10 @@ Readiness Probe property overrides
{{- define "spark-operator.probePort" -}}
{{- default 19091 .Values.operatorDeployment.operatorPod.operatorContainer.probes.port }}
{{- end }}

{{/*
Port for metrics
*/}}
{{- define "spark-operator.metricsPort" -}}
{{- default 19090 .Values.operatorDeployment.operatorPod.operatorContainer.metrics.port }}
{{- end }}
2 changes: 2 additions & 0 deletions build-tools/helm/spark-kubernetes-operator/templates/spark-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ spec:
ports:
- containerPort: {{ include "spark-operator.probePort" . }}
name: probe-port
- containerPort: {{ include "spark-operator.metricsPort" . }}
name: metrics-port
env:
- name: OPERATOR_NAMESPACE
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions build-tools/helm/spark-kubernetes-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ operatorDeployment:
startupProbe:
failureThreshold: 30
periodSeconds: 10
metrics:
port: 19090
# By default, operator container is configured to comply restricted standard
# https://kubernetes.io/docs/concepts/security/pod-security-standards/
securityContext:
Expand Down
Loading