diff --git a/charts/topograph/charts/node-data-broker/templates/daemonset.yaml b/charts/topograph/charts/node-data-broker/templates/daemonset.yaml index 2fc37fab..ff9661ee 100644 --- a/charts/topograph/charts/node-data-broker/templates/daemonset.yaml +++ b/charts/topograph/charts/node-data-broker/templates/daemonset.yaml @@ -5,6 +5,9 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ include "node-data-broker.fullname" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "node-data-broker.labels" . | nindent 4 }} spec: diff --git a/charts/topograph/charts/node-data-broker/templates/serviceaccount.yaml b/charts/topograph/charts/node-data-broker/templates/serviceaccount.yaml index 216d4c5b..4949b23a 100644 --- a/charts/topograph/charts/node-data-broker/templates/serviceaccount.yaml +++ b/charts/topograph/charts/node-data-broker/templates/serviceaccount.yaml @@ -3,6 +3,9 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "node-data-broker.serviceAccountName" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "node-data-broker.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} diff --git a/charts/topograph/charts/node-observer/templates/configmap.yml b/charts/topograph/charts/node-observer/templates/configmap.yml index db1ac179..0f6bdf78 100644 --- a/charts/topograph/charts/node-observer/templates/configmap.yml +++ b/charts/topograph/charts/node-observer/templates/configmap.yml @@ -2,6 +2,9 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "node-observer.fullname" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "node-observer.labels" . | nindent 4 }} data: diff --git a/charts/topograph/charts/node-observer/templates/deployment.yaml b/charts/topograph/charts/node-observer/templates/deployment.yaml index 52de1ea4..d562964c 100644 --- a/charts/topograph/charts/node-observer/templates/deployment.yaml +++ b/charts/topograph/charts/node-observer/templates/deployment.yaml @@ -2,6 +2,9 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "node-observer.fullname" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "node-observer.labels" . | nindent 4 }} spec: diff --git a/charts/topograph/charts/node-observer/templates/serviceaccount.yaml b/charts/topograph/charts/node-observer/templates/serviceaccount.yaml index 44e09ea3..680443cb 100644 --- a/charts/topograph/charts/node-observer/templates/serviceaccount.yaml +++ b/charts/topograph/charts/node-observer/templates/serviceaccount.yaml @@ -3,6 +3,9 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "node-observer.serviceAccountName" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "node-observer.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} diff --git a/charts/topograph/templates/configmap.yml b/charts/topograph/templates/configmap.yml index 8b657c1a..b0d704fd 100644 --- a/charts/topograph/templates/configmap.yml +++ b/charts/topograph/templates/configmap.yml @@ -2,6 +2,9 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "topograph.fullname" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "topograph.labels" . | nindent 4 }} data: diff --git a/charts/topograph/templates/deployment.yaml b/charts/topograph/templates/deployment.yaml index 47e7bb70..293fc83a 100644 --- a/charts/topograph/templates/deployment.yaml +++ b/charts/topograph/templates/deployment.yaml @@ -5,6 +5,9 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "topograph.fullname" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "topograph.labels" . | nindent 4 }} spec: diff --git a/charts/topograph/templates/httproute.yaml b/charts/topograph/templates/httproute.yaml index 6f2954b8..56d6ff2b 100644 --- a/charts/topograph/templates/httproute.yaml +++ b/charts/topograph/templates/httproute.yaml @@ -19,6 +19,9 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: {{ $fullName }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "topograph.labels" . | nindent 4 }} {{- with .Values.gatewayAPI.annotations }} diff --git a/charts/topograph/templates/ingress.yaml b/charts/topograph/templates/ingress.yaml index c669abd8..0df8ca95 100644 --- a/charts/topograph/templates/ingress.yaml +++ b/charts/topograph/templates/ingress.yaml @@ -16,6 +16,9 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $fullName }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "topograph.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} diff --git a/charts/topograph/templates/service.yaml b/charts/topograph/templates/service.yaml index c81635da..e597c83c 100644 --- a/charts/topograph/templates/service.yaml +++ b/charts/topograph/templates/service.yaml @@ -2,6 +2,9 @@ apiVersion: v1 kind: Service metadata: name: {{ include "topograph.fullname" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "topograph.labels" . | nindent 4 }} spec: diff --git a/charts/topograph/templates/serviceaccount.yaml b/charts/topograph/templates/serviceaccount.yaml index f8811e71..4a239303 100644 --- a/charts/topograph/templates/serviceaccount.yaml +++ b/charts/topograph/templates/serviceaccount.yaml @@ -3,6 +3,9 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "topograph.serviceAccountName" . }} + {{- if ne .Release.Namespace "default" }} + namespace: {{ .Release.Namespace }} + {{- end}} labels: {{- include "topograph.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }}