Include namespace name in Helm charts (#1359)

Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com>
tomkerkhove · Nov 19, 2020 · 6f37fac · 6f37fac
1 parent ae43062
commit 6f37fac
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 0 deletions.
diff --git a/charts/promitor-agent-resource-discovery/templates/configmap.yaml b/charts/promitor-agent-resource-discovery/templates/configmap.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-map-{{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 data:

diff --git a/charts/promitor-agent-resource-discovery/templates/deployment.yaml b/charts/promitor-agent-resource-discovery/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 spec:

diff --git a/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml b/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 spec:

diff --git a/charts/promitor-agent-resource-discovery/templates/role.yaml b/charts/promitor-agent-resource-discovery/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 rules:

diff --git a/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml b/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 roleRef:

diff --git a/charts/promitor-agent-resource-discovery/templates/secret.yaml b/charts/promitor-agent-resource-discovery/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "promitor-agent-resource-discovery.secretname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 type: Opaque

diff --git a/charts/promitor-agent-resource-discovery/templates/service.yaml b/charts/promitor-agent-resource-discovery/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "promitor-agent-resource-discovery.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
 {{- if and (.Values.service.loadBalancer.enabled) (.Values.service.loadBalancer.dnsPrefix) }}

diff --git a/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml b/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "promitor-agent-resource-discovery.serviceaccountname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }}
   {{- if .Values.rbac.serviceAccount.annotations }}

diff --git a/charts/promitor-agent-scraper/templates/configmap.yaml b/charts/promitor-agent-scraper/templates/configmap.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-map-{{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 data:

diff --git a/charts/promitor-agent-scraper/templates/deployment.yaml b/charts/promitor-agent-scraper/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 spec:

diff --git a/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml b/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 spec:

diff --git a/charts/promitor-agent-scraper/templates/role.yaml b/charts/promitor-agent-scraper/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 rules:

diff --git a/charts/promitor-agent-scraper/templates/rolebinding.yaml b/charts/promitor-agent-scraper/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 roleRef:

diff --git a/charts/promitor-agent-scraper/templates/secret.yaml b/charts/promitor-agent-scraper/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "promitor-agent-scraper.secretname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 type: Opaque

diff --git a/charts/promitor-agent-scraper/templates/service.yaml b/charts/promitor-agent-scraper/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "promitor-agent-scraper.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
 {{- if and (.Values.service.loadBalancer.enabled) (.Values.service.loadBalancer.dnsPrefix) }}

diff --git a/charts/promitor-agent-scraper/templates/serviceaccount.yaml b/charts/promitor-agent-scraper/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "promitor-agent-scraper.serviceaccountname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "promitor-agent-scraper.labels" . | nindent 4 }}
   {{- if .Values.rbac.serviceAccount.annotations }}