Skip to content

Commit 2021574

Browse files
dnskrpan3793
authored andcommitted
[KYUUBI #7105] [K8S][HELM] Support additional labels for PrometheusRule
### Why are the changes needed? The change is needed to be able to add additional labels to `PrometheusRule` similar to [podMonitor](https://github.com/apache/kyuubi/blob/523722788fd4fbf661cce8572c529af09c34079a/charts/kyuubi/values.yaml#L321-L330) and [serviceMonitor](https://github.com/apache/kyuubi/blob/523722788fd4fbf661cce8572c529af09c34079a/charts/kyuubi/values.yaml#L333-L341). The PR also includes minor identation fixes. ### How was this patch tested? ```shell helm template kyuubi charts/kyuubi --set metrics.prometheusRule.enabled=true --set metrics.prometheusRule.labels.test-label=true -s templates/kyuubi-alert.yaml --- # Source: kyuubi/templates/kyuubi-alert.yaml apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: kyuubi labels: helm.sh/chart: kyuubi-0.1.0 app.kubernetes.io/name: kyuubi app.kubernetes.io/instance: kyuubi app.kubernetes.io/version: "1.10.0" app.kubernetes.io/managed-by: Helm test-label: true spec: groups: [] ``` ### Was this patch authored or co-authored using generative AI tooling? No Closes #7105 from dnskr/helm-prometheusRule-labels. Closes #7105 234d99d [dnskr] [K8S][HELM] Support additional labels for PrometheusRule Authored-by: dnskr <dnskrv88@gmail.com> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent bdeb294 commit 2021574

5 files changed

Lines changed: 8 additions & 3 deletions

File tree

charts/kyuubi/templates/kyuubi-alert.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ metadata:
2222
name: {{ .Release.Name }}
2323
labels:
2424
{{- include "kyuubi.labels" . | nindent 4 }}
25+
{{- if .Values.metrics.prometheusRule.labels }}
26+
{{- toYaml .Values.metrics.prometheusRule.labels | nindent 4 }}
27+
{{- end }}
2528
spec:
2629
groups:
2730
{{- toYaml .Values.metrics.prometheusRule.groups | nindent 4 }}

charts/kyuubi/templates/kyuubi-podmonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ metadata:
2323
labels:
2424
{{- include "kyuubi.labels" . | nindent 4 }}
2525
{{- if .Values.metrics.podMonitor.labels }}
26-
{{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }}
26+
{{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }}
2727
{{- end }}
2828
spec:
2929
selector:

charts/kyuubi/templates/kyuubi-servicemonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ metadata:
2323
labels:
2424
{{- include "kyuubi.labels" . | nindent 4 }}
2525
{{- if .Values.metrics.serviceMonitor.labels }}
26-
{{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
26+
{{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
2727
{{- end }}
2828
spec:
2929
selector:

charts/kyuubi/templates/kyuubi-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
checksum/conf: {{ include (print $.Template.BasePath "/kyuubi-configmap.yaml") . | sha256sum }}
4242
checksum/conf-hadoop: {{ include (print $.Template.BasePath "/kyuubi-hadoop-configmap.yaml") . | sha256sum }}
4343
{{- with .Values.podAnnotations }}
44-
{{- toYaml . | nindent 8 }}
44+
{{- toYaml . | nindent 8 }}
4545
{{- end }}
4646
spec:
4747
{{- with .Values.imagePullSecrets }}

charts/kyuubi/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,3 +346,5 @@ metrics:
346346
enabled: false
347347
# Content of Prometheus rule file
348348
groups: []
349+
# Additional labels to be used to make PrometheusRule discovered by Prometheus
350+
labels: {}

0 commit comments

Comments
 (0)