Skip to content

Commit 775aef4

Browse files
nschadnschad
authored
fix podTargetLabels in all Prometheus ServiceMonitor CRDs (#487)
* fix podTargetLabels in all Prometheus ServiceMonitor CRD's Signed-off-by: Niclas Schad <niclas.schad@gmail.com> * add pr number Signed-off-by: Niclas Schad <niclas.schad@gmail.com> --------- Signed-off-by: Niclas Schad <niclas.schad@gmail.com>
1 parent 862bb7b commit 775aef4

11 files changed

Lines changed: 21 additions & 20 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.2 #459
1111
* [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.3 #471
1212
* [BUGFIX] Correctly interpret .Capabilities.KubeVersion when it looks like a prerelease #457
13+
* [BUGFIX] Fix podTargetLabels in all Prometheus ServiceMonitor CRDs #487
1314

1415
## 2.1.0 / 2023-03-17
1516

‎templates/alertmanager/alertmanager-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.alertmanager.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.alertmanager.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/compactor/compactor-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.compactor.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.compactor.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/distributor/distributor-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.distributor.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.distributor.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/ingester/ingester-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.ingester.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.ingester.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/overrides-exporter/overrides-exporter-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.overrides_exporter.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.overrides_exporter.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/querier/querier-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.querier.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.querier.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/query-frontend/query-frontend-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.query_frontend.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.query_frontend.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/query-scheduler/query-scheduler-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.query_scheduler.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.query_scheduler.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

‎templates/ruler/ruler-servicemonitor.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ spec:
2020
namespaceSelector:
2121
matchNames:
2222
- {{ .Release.Namespace | quote }}
23-
{{- if .Values.purger.serviceMonitor.podTargetLabels }}
23+
{{- if .Values.ruler.serviceMonitor.podTargetLabels }}
2424
podTargetLabels:
25-
{{- range .Values.purger.serviceMonitor.podTargetLabels }}
25+
{{- range .Values.ruler.serviceMonitor.podTargetLabels }}
2626
- {{ . }}
2727
{{- end }}
2828
{{- end }}

0 commit comments

Comments
 (0)