Added namespaceOverride value

deploy/charts/x509-certificate-exporter/templates/_helpers.tpl

@@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "x509-certificate-exporter.namespace" -}}
+{{- if .Values.namespaceOverride }}
+{{- .Values.namespaceOverride }}
+{{- else }}
+{{- .Release.Namespace }}
+{{- end }}
+{{- end }}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

deploy/charts/x509-certificate-exporter/templates/clusterrole.yaml

@@ -5,6 +5,7 @@ apiVersion: {{ include "capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
   name: {{ include "x509-certificate-exporter.secretsExporterClusterRoleName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
   {{- with .Values.rbac.secretsExporter.clusterRoleAnnotations }}
@@ -59,6 +60,7 @@ apiVersion: {{ include "capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
   name: {{ include "x509-certificate-exporter.hostPathsExporterClusterRoleName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
   {{- with .Values.rbac.hostPathsExporter.clusterRoleAnnotations }}

deploy/charts/x509-certificate-exporter/templates/clusterrolebinding.yaml

@@ -5,6 +5,7 @@ apiVersion: {{ include "capabilities.rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "x509-certificate-exporter.secretsExporterClusterRoleBindingName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
 {{- with .Values.rbac.secretsExporter.clusterRoleBindingAnnotations }}
@@ -26,6 +27,7 @@ apiVersion: {{ include "capabilities.rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "x509-certificate-exporter.hostPathsExporterClusterRoleBindingName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
   {{- with .Values.rbac.hostPathsExporter.clusterRoleBindingAnnotations }}

deploy/charts/x509-certificate-exporter/templates/daemonset.yaml

@@ -7,6 +7,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ printf "%s-%s" (include "x509-certificate-exporter.fullname" $) $dsName }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" $ | nindent 4 }}
 spec:

deploy/charts/x509-certificate-exporter/templates/deployment.yaml

@@ -5,6 +5,7 @@ apiVersion: {{ include "capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ include "x509-certificate-exporter.secretsExporterName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
 spec:

deploy/charts/x509-certificate-exporter/templates/grafana-dashboard.configmap.yaml

@@ -5,6 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ printf "%s-%s" (include "x509-certificate-exporter.fullname" $) "dashboard" | trunc 63 | trimSuffix "-" }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
     {{ .Values.grafana.sidecarLabel | quote }}: {{ .Values.grafana.sidecarLabelValue | quote }}

deploy/charts/x509-certificate-exporter/templates/podmonitor.yaml

@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ include "x509-certificate-exporter.fullname" . }}-podmonitor
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
     {{- with .Values.prometheusPodMonitor.extraLabels }}

deploy/charts/x509-certificate-exporter/templates/prometheusrule.yaml

@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ include "x509-certificate-exporter.fullname" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
     {{- with .Values.prometheusRules.extraLabels }}

deploy/charts/x509-certificate-exporter/templates/psp.yaml

@@ -5,6 +5,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ include "x509-certificate-exporter.secretsExporterName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
 spec:
@@ -40,6 +41,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ printf "%s-%s" (include "x509-certificate-exporter.fullname" $) $dsName }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" $ | nindent 4 }}
 spec:

deploy/charts/x509-certificate-exporter/templates/service.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "x509-certificate-exporter.fullname" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
     {{- with .Values.service.extraLabels }}

deploy/charts/x509-certificate-exporter/templates/serviceaccount.yaml

@@ -5,6 +5,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "x509-certificate-exporter.secretsExporterServiceAccountName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
   {{- with .Values.rbac.secretsExporter.serviceAccountAnnotations }}
@@ -18,6 +19,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "x509-certificate-exporter.hostPathsExporterServiceAccountName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
   {{- with .Values.rbac.hostPathsExporter.serviceAccountAnnotations }}

deploy/charts/x509-certificate-exporter/templates/servicemonitor.yaml

@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "x509-certificate-exporter.fullname" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
     {{- with .Values.prometheusServiceMonitor.extraLabels }}

deploy/charts/x509-certificate-exporter/templates/webconfig.secret.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "x509-certificate-exporter.webConfigurationSecretName" . }}
+  namespace: {{ include "x509-certificate-exporter.namespace" . }}
   labels:
     {{- include "x509-certificate-exporter.labels" . | nindent 4 }}
 data:

deploy/charts/x509-certificate-exporter/values.yaml

@@ -13,6 +13,9 @@ nameOverride: ""
 # -- Fully override x509-certificate-exporter.fullname template
 fullnameOverride: ""
 
+# -- Override the deployment namespace
+namespaceOverride: ""
+
 # -- Additional objects to deploy with the release
 extraDeploy: []
 # -- Same as `extraDeploy` but objects won't go through the templating engine