[kube-prometheus-stack] Use prometheus-node-exporter.namespaceOverrid…

…e when set

Signed-off-by: Mathieu Parent <math.parent@gmail.com>

charts/kube-prometheus-stack/Chart.yaml

@@ -18,7 +18,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 18.0.9
+version: 18.0.10
 appVersion: 0.50.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/templates/_helpers.tpl

@@ -118,6 +118,17 @@ Use the kube-state-metrics namespace override for multi-namespace deployments in
   {{- end -}}
 {{- end -}}
 
+{{/*
+Use the prometheus-node-exporter namespace override for multi-namespace deployments in combined charts
+*/}}
+{{- define "prometheus-node-exporter.namespace" -}}
+  {{- if index .Values "prometheus-node-exporter" "namespaceOverride" -}}
+    {{- index .Values "prometheus-node-exporter" "namespaceOverride" -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/* Allow KubeVersion to be overridden. */}}
 {{- define "kube-prometheus-stack.kubeVersion" -}}
   {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}}

charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus-stack.fullname" . }}-node-exporter
-  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-node-exporter
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}