[prometheus-node-exporter]Add availability to deploy ServiceMonitor o…

…nto a specific namespace. (prometheus-community#1526) * Add availability to deploy ServiceMonitor onto a specific namespace. prometheus-community#1515 Signed-off-by: RyuSA <[email protected]> * bumps up node-exporter version 2.2.0 -> 2.2.1 Signed-off-by: RyuSA <[email protected]>
mihneastaub · Nov 27, 2021 · 5d2f7ca · 5d2f7ca
1 parent 1442841
commit 5d2f7ca
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.2.2
 description: A Helm chart for prometheus node-exporter
 name: prometheus-node-exporter
-version: 2.2.0
+version: 2.2.1
 type: application
 home: https://github.com/prometheus/node_exporter/
 sources:

diff --git a/charts/prometheus-node-exporter/templates/_helpers.tpl b/charts/prometheus-node-exporter/templates/_helpers.tpl
@@ -64,3 +64,18 @@ Allow the release namespace to be overridden for multi-namespace deployments in
     {{- .Release.Namespace -}}
   {{- end -}}
 {{- end -}}
+
+{{/*
+Create the namespace name of the service monitor
+*/}}
+{{- define "prometheus-node-exporter.monitor-namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- if .Values.prometheus.monitor.namespace -}}
+      {{- .Values.prometheus.monitor.namespace -}}
+    {{- else -}}
+      {{- .Release.Namespace -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/prometheus-node-exporter/templates/monitor.yaml b/charts/prometheus-node-exporter/templates/monitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
-  namespace: {{ template "prometheus-node-exporter.namespace" . }}
+  namespace: {{ template "prometheus-node-exporter.monitor-namespace" . }}
   labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
   {{- if .Values.prometheus.monitor.additionalLabels }}
 {{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}