[stable/prometheus-node-exporter] Override of namespace

Signed-off-by: Alexander Katsyuba <arruzk@gmail.com>

stable/prometheus-node-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.18.1
 description: A Helm chart for prometheus node-exporter
 name: prometheus-node-exporter
-version: 1.7.3
+version: 1.7.4
 home: /~https://github.com/prometheus/node_exporter/
 sources:
 - /~https://github.com/prometheus/node_exporter/

stable/prometheus-node-exporter/README.md

@@ -67,6 +67,7 @@ The following table lists the configurable parameters of the Node Exporter chart
 | `prometheus.monitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as prometheus node exporter` | |
 | `prometheus.monitor.scrapeTimeout` | Timeout after which the scrape is ended | `10s` | |
 | `configmaps`                      | Allow mounting additional configmaps.                                                                                         | `[]`                                    |     |
+| `namespaceOverride`               | Override the deployment namespace     | `""` (`Release.Namespace`)             |  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

stable/prometheus-node-exporter/templates/_helpers.tpl

@@ -53,3 +53,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "prometheus-node-exporter.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}

stable/prometheus-node-exporter/templates/daemonset.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
   labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 spec:
   selector:

stable/prometheus-node-exporter/templates/endpoints.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Endpoints
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
   labels:
 {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 subsets:
@@ -14,4 +15,4 @@ subsets:
       - name: metrics
         port: 9100
         protocol: TCP
-{{- end }}
+{{- end }}

stable/prometheus-node-exporter/templates/monitor.yaml

@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
   labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
   {{- if .Values.prometheus.monitor.additionalLabels }}
 {{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}

stable/prometheus-node-exporter/templates/psp-clusterrole.yaml

@@ -3,8 +3,9 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
   name: psp-{{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
+  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 rules:
 - apiGroups: ['extensions']
   resources: ['podsecuritypolicies']

stable/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml

@@ -3,8 +3,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
   name: psp-{{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
+  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

stable/prometheus-node-exporter/templates/psp.yaml

@@ -3,8 +3,9 @@
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
   name: {{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
+  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 spec:
   privileged: false
   # Required to prevent escalations to root.

stable/prometheus-node-exporter/templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
 {{- if .Values.service.annotations }}
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}

stable/prometheus-node-exporter/templates/serviceaccount.yaml

@@ -4,12 +4,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "prometheus-node-exporter.serviceAccountName" . }}
+  namespace: {{ template "prometheus-node-exporter.namespace" . }}
   labels:
     app: {{ template "prometheus-node-exporter.name" . }}
-    chart: {{ template "prometheus-node-exporter.chart" . }}    
+    chart: {{ template "prometheus-node-exporter.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-imagePullSecrets: 
+imagePullSecrets:
 {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}
 {{- end -}}
-{{- end -}}
+{{- end -}}

stable/prometheus-node-exporter/values.yaml

@@ -105,3 +105,7 @@ extraHostVolumeMounts: []
 configmaps: []
 # - name: <configMapName>
 #   mountPath: <mountPath>
+
+## Override the deployment namespace
+##
+namespaceOverride: ""