fix(thanos): Fixed service monitor job name (#944)

Signed-off-by: Steve Hipwell <[email protected]>
stevehipwell · Apr 23, 2024 · 8f2eb60 · 8f2eb60
1 parent a086bd8
commit 8f2eb60
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 14 deletions.
diff --git a/charts/thanos/CHANGELOG.md b/charts/thanos/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v1.16.5] - 2024-04-23
+
+### Fixed
+
+- Fixed `ServiceMonitor` job name.
+
 ## [v1.16.4] - 2024-04-22
 
 ### Added
@@ -474,6 +480,7 @@
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/thanos
+[v1.16.5]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.5
 [v1.16.4]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.4
 [v1.16.3]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.3
 [v1.16.2]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.2

diff --git a/charts/thanos/Chart.yaml b/charts/thanos/Chart.yaml
@@ -22,9 +22,5 @@ maintainers:
     email: [email protected]
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: "Added the remote write port to the _Thanos Receive_ ingress."
-    - kind: changed
-      description: "Switched to using the port name for ingress."
     - kind: fixed
-      description: "Fixed incorrect `ServiceMonitor` name via the `jobLabel` field."
+      description: "Fixed `ServiceMonitor` job name."
diff --git a/charts/thanos/templates/compact/_helpers.tpl b/charts/thanos/templates/compact/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.compact.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: compact
+app.kubernetes.io/component-instance: {{ .Release.Name }}-compact
 {{- end }}
 
 {{/*

diff --git a/charts/thanos/templates/compact/servicemonitor.yaml b/charts/thanos/templates/compact/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/thanos/templates/query-frontend/_helpers.tpl b/charts/thanos/templates/query-frontend/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.queryFrontend.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: query-frontend
+app.kubernetes.io/component-instance: {{ .Release.Name }}-query-frontend
 {{- end }}
 
 {{/*

diff --git a/charts/thanos/templates/query-frontend/servicemonitor.yaml b/charts/thanos/templates/query-frontend/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/thanos/templates/query/_helpers.tpl b/charts/thanos/templates/query/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.query.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: query
+app.kubernetes.io/component-instance: {{ .Release.Name }}-query
 {{- end }}
 
 {{/*

diff --git a/charts/thanos/templates/query/servicemonitor.yaml b/charts/thanos/templates/query/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/thanos/templates/receive-ingestor/_helpers.tpl b/charts/thanos/templates/receive-ingestor/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.receive.ingestor.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: receive-ingestor
+app.kubernetes.io/component-instance: {{ .Release.Name }}-receive-ingestor
 {{- end }}
 
 {{/*

diff --git a/charts/thanos/templates/receive-ingestor/servicemonitor.yaml b/charts/thanos/templates/receive-ingestor/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/thanos/templates/receive-router/_helpers.tpl b/charts/thanos/templates/receive-router/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.receive.router.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: receive-router
+app.kubernetes.io/component-instance: {{ .Release.Name }}-receive-router
 {{- end }}
 
 {{/*

diff --git a/charts/thanos/templates/receive-router/servicemonitor.yaml b/charts/thanos/templates/receive-router/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/thanos/templates/rule/_helpers.tpl b/charts/thanos/templates/rule/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.rule.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: rule
+app.kubernetes.io/component-instance: {{ .Release.Name }}-rule
 {{- end }}
 
 {{/*
@@ -74,5 +75,3 @@ Patch topology spread constraints
 {{- include "thanos.patchLabelSelector" (merge (dict "_target" $constraint "_selectorLabelsTemplate" "thanos.rule.selectorLabels") $) }}
 {{- end }}
 {{- end }}
-
-
diff --git a/charts/thanos/templates/rule/servicemonitor.yaml b/charts/thanos/templates/rule/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/thanos/templates/store-gateway/_helpers.tpl b/charts/thanos/templates/store-gateway/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "thanos.storeGateway.labels" -}}
 {{ include "thanos.labels" . }}
 app.kubernetes.io/component: store-gateway
+app.kubernetes.io/component-instance: {{ .Release.Name }}-store-gateway
 {{- end }}
 
 {{/*

diff --git a/charts/thanos/templates/store-gateway/servicemonitor.yaml b/charts/thanos/templates/store-gateway/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}