fix podTargetLabels in all Prometheus ServiceMonitor CRDs (#487)

* fix podTargetLabels in all Prometheus ServiceMonitor CRD's Signed-off-by: Niclas Schad <[email protected]> * add pr number Signed-off-by: Niclas Schad <[email protected]> --------- Signed-off-by: Niclas Schad <[email protected]>
cortexproject · Dec 18, 2023 · 775aef4 · 775aef4
1 parent 862bb7b
commit 775aef4
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.2 #459
 * [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.3 #471
 * [BUGFIX] Correctly interpret .Capabilities.KubeVersion when it looks like a prerelease #457
+* [BUGFIX] Fix podTargetLabels in all Prometheus ServiceMonitor CRDs #487
 
 ## 2.1.0 / 2023-03-17
 

diff --git a/templates/alertmanager/alertmanager-servicemonitor.yaml b/templates/alertmanager/alertmanager-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.alertmanager.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.alertmanager.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/compactor/compactor-servicemonitor.yaml b/templates/compactor/compactor-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.compactor.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.compactor.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/distributor/distributor-servicemonitor.yaml b/templates/distributor/distributor-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.distributor.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.distributor.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/ingester/ingester-servicemonitor.yaml b/templates/ingester/ingester-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.ingester.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.ingester.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/overrides-exporter/overrides-exporter-servicemonitor.yaml b/templates/overrides-exporter/overrides-exporter-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.overrides_exporter.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.overrides_exporter.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/querier/querier-servicemonitor.yaml b/templates/querier/querier-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.querier.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.querier.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/query-frontend/query-frontend-servicemonitor.yaml b/templates/query-frontend/query-frontend-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.query_frontend.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.query_frontend.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/query-scheduler/query-scheduler-servicemonitor.yaml b/templates/query-scheduler/query-scheduler-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.query_scheduler.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.query_scheduler.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/ruler/ruler-servicemonitor.yaml b/templates/ruler/ruler-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.ruler.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.ruler.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}

diff --git a/templates/store-gateway/store-gateway-servicemonitor.yaml b/templates/store-gateway/store-gateway-servicemonitor.yaml
@@ -20,9 +20,9 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-  {{- if .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- if .Values.store_gateway.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{- range .Values.purger.serviceMonitor.podTargetLabels }}
+  {{- range .Values.store_gateway.serviceMonitor.podTargetLabels }}
     - {{ . }}
   {{- end }}
   {{- end }}