diff --git a/build-tools/helm/spark-kubernetes-operator/templates/_helpers.tpl b/build-tools/helm/spark-kubernetes-operator/templates/_helpers.tpl index 79ad2cd4..bd8cc86b 100644 --- a/build-tools/helm/spark-kubernetes-operator/templates/_helpers.tpl +++ b/build-tools/helm/spark-kubernetes-operator/templates/_helpers.tpl @@ -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" . }} {{- if .Values.workloadResources.namespaces.overrideWatchedNamespaces }} spark.kubernetes.operator.watchedNamespaces={{ include "spark-operator.workloadNamespacesStr" . | trim }} {{- end }} @@ -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 }} diff --git a/build-tools/helm/spark-kubernetes-operator/templates/spark-operator.yaml b/build-tools/helm/spark-kubernetes-operator/templates/spark-operator.yaml index 78c76d34..d6bf072e 100644 --- a/build-tools/helm/spark-kubernetes-operator/templates/spark-operator.yaml +++ b/build-tools/helm/spark-kubernetes-operator/templates/spark-operator.yaml @@ -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: diff --git a/build-tools/helm/spark-kubernetes-operator/values.yaml b/build-tools/helm/spark-kubernetes-operator/values.yaml index 1771b89c..58f1c301 100644 --- a/build-tools/helm/spark-kubernetes-operator/values.yaml +++ b/build-tools/helm/spark-kubernetes-operator/values.yaml @@ -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: