resolve conflicts with master

apache · Dec 10, 2024 · f8fa51f · f8fa51f
1 parent 99e27d4
commit f8fa51f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/charts/kyuubi/templates/kyuubi-podmonitor.yaml b/charts/kyuubi/templates/kyuubi-podmonitor.yaml
@@ -22,6 +22,9 @@ metadata:
   name: {{ .Release.Name }}
   labels:
     {{- include "kyuubi.labels" . | nindent 4 }}
+    {{- if .Values.metrics.podMonitor.labels }}
+    {{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:

diff --git a/charts/kyuubi/values.yaml b/charts/kyuubi/values.yaml
@@ -285,6 +285,8 @@ metrics:
     #  podMetricsEndpoints：
     #    - path: /metrics
     #      port: prometheus
+    # Additional labels to be used to make podMonitor discovered by Prometheus
+    labels: {}
 
   # ServiceMonitor by Prometheus Operator
   serviceMonitor: