From 3738dea76dd1c8199b7bf9c234cd5e34e5304d39 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 30 Jun 2022 16:56:40 +0000
Subject: [PATCH] chore(helm): Adding namespaces to all templates (#565)

---
 .../openreplay/charts/alerts/templates/deployment.yaml           | 1 +
 scripts/helmcharts/openreplay/charts/alerts/templates/hpa.yaml   | 1 +
 .../helmcharts/openreplay/charts/alerts/templates/ingress.yaml   | 1 +
 .../helmcharts/openreplay/charts/alerts/templates/service.yaml   | 1 +
 .../openreplay/charts/alerts/templates/serviceaccount.yaml       | 1 +
 .../openreplay/charts/assets/templates/deployment.yaml           | 1 +
 scripts/helmcharts/openreplay/charts/assets/templates/hpa.yaml   | 1 +
 .../helmcharts/openreplay/charts/assets/templates/ingress.yaml   | 1 +
 .../helmcharts/openreplay/charts/assets/templates/service.yaml   | 1 +
 .../openreplay/charts/assets/templates/serviceaccount.yaml       | 1 +
 .../openreplay/charts/assist/templates/deployment.yaml           | 1 +
 scripts/helmcharts/openreplay/charts/assist/templates/hpa.yaml   | 1 +
 .../helmcharts/openreplay/charts/assist/templates/ingress.yaml   | 1 +
 .../helmcharts/openreplay/charts/assist/templates/service.yaml   | 1 +
 .../openreplay/charts/assist/templates/serviceaccount.yaml       | 1 +
 .../openreplay/charts/chalice/templates/deployment.yaml          | 1 +
 scripts/helmcharts/openreplay/charts/chalice/templates/hpa.yaml  | 1 +
 .../helmcharts/openreplay/charts/chalice/templates/ingress.yaml  | 1 +
 .../helmcharts/openreplay/charts/chalice/templates/service.yaml  | 1 +
 .../openreplay/charts/chalice/templates/serviceaccount.yaml      | 1 +
 .../helmcharts/openreplay/charts/db/templates/deployment.yaml    | 1 +
 scripts/helmcharts/openreplay/charts/db/templates/hpa.yaml       | 1 +
 scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml   | 1 +
 scripts/helmcharts/openreplay/charts/db/templates/service.yaml   | 1 +
 .../openreplay/charts/db/templates/serviceaccount.yaml           | 1 +
 .../helmcharts/openreplay/charts/ender/templates/deployment.yaml | 1 +
 scripts/helmcharts/openreplay/charts/ender/templates/hpa.yaml    | 1 +
 .../helmcharts/openreplay/charts/ender/templates/ingress.yaml    | 1 +
 .../helmcharts/openreplay/charts/ender/templates/service.yaml    | 1 +
 .../openreplay/charts/ender/templates/serviceaccount.yaml        | 1 +
 .../openreplay/charts/frontend/templates/deployment.yaml         | 1 +
 scripts/helmcharts/openreplay/charts/frontend/templates/hpa.yaml | 1 +
 .../helmcharts/openreplay/charts/frontend/templates/ingress.yaml | 1 +
 .../helmcharts/openreplay/charts/frontend/templates/service.yaml | 1 +
 .../openreplay/charts/frontend/templates/serviceaccount.yaml     | 1 +
 .../openreplay/charts/heuristics/templates/deployment.yaml       | 1 +
 .../helmcharts/openreplay/charts/heuristics/templates/hpa.yaml   | 1 +
 .../openreplay/charts/heuristics/templates/ingress.yaml          | 1 +
 .../openreplay/charts/heuristics/templates/service.yaml          | 1 +
 .../openreplay/charts/heuristics/templates/serviceaccount.yaml   | 1 +
 .../helmcharts/openreplay/charts/http/templates/deployment.yaml  | 1 +
 scripts/helmcharts/openreplay/charts/http/templates/hpa.yaml     | 1 +
 scripts/helmcharts/openreplay/charts/http/templates/ingress.yaml | 1 +
 scripts/helmcharts/openreplay/charts/http/templates/service.yaml | 1 +
 .../openreplay/charts/http/templates/serviceaccount.yaml         | 1 +
 .../openreplay/charts/integrations/templates/deployment.yaml     | 1 +
 .../helmcharts/openreplay/charts/integrations/templates/hpa.yaml | 1 +
 .../openreplay/charts/integrations/templates/ingress.yaml        | 1 +
 .../openreplay/charts/integrations/templates/service.yaml        | 1 +
 .../openreplay/charts/integrations/templates/serviceaccount.yaml | 1 +
 .../helmcharts/openreplay/charts/peers/templates/deployment.yaml | 1 +
 scripts/helmcharts/openreplay/charts/peers/templates/hpa.yaml    | 1 +
 .../helmcharts/openreplay/charts/peers/templates/ingress.yaml    | 1 +
 .../helmcharts/openreplay/charts/peers/templates/service.yaml    | 1 +
 .../openreplay/charts/peers/templates/serviceaccount.yaml        | 1 +
 .../helmcharts/openreplay/charts/sink/templates/deployment.yaml  | 1 +
 scripts/helmcharts/openreplay/charts/sink/templates/hpa.yaml     | 1 +
 scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml | 1 +
 scripts/helmcharts/openreplay/charts/sink/templates/service.yaml | 1 +
 .../openreplay/charts/sink/templates/serviceaccount.yaml         | 1 +
 .../openreplay/charts/storage/templates/deployment.yaml          | 1 +
 scripts/helmcharts/openreplay/charts/storage/templates/hpa.yaml  | 1 +
 .../helmcharts/openreplay/charts/storage/templates/ingress.yaml  | 1 +
 .../helmcharts/openreplay/charts/storage/templates/service.yaml  | 1 +
 .../openreplay/charts/storage/templates/serviceaccount.yaml      | 1 +
 .../openreplay/charts/utilities/templates/efs-cron.yaml          | 1 +
 .../helmcharts/openreplay/charts/utilities/templates/hpa.yaml    | 1 +
 .../openreplay/charts/utilities/templates/ingress.yaml           | 1 +
 .../openreplay/charts/utilities/templates/serviceaccount.yaml    | 1 +
 69 files changed, 69 insertions(+)

diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml
index d700bcc33..f3489ff31 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "alerts.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alerts.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/hpa.yaml
index b25fef03d..75729660f 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "alerts.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alerts.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml
index 3f1a45d93..b67de0c31 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alerts.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/service.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/service.yaml
index 6c1eb5faa..ccb21851a 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "alerts.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alerts.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/serviceaccount.yaml
index 044787236..e5eb2a808 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "alerts.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alerts.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
index 7ff32681f..905483d71 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "assets.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assets.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/hpa.yaml
index 7b271a20e..43779c270 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "assets.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assets.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml
index 42d167e6f..9b847cf11 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assets.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/service.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/service.yaml
index 5567e139d..5e327f83b 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "assets.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assets.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/serviceaccount.yaml
index 90c3f5319..3e73828d6 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "assets.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assets.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml
index 6e1ec426c..d5a137b0d 100644
--- a/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "assist.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assist.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/assist/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/assist/templates/hpa.yaml
index b0b394a20..9419258e8 100644
--- a/scripts/helmcharts/openreplay/charts/assist/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/assist/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "assist.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assist.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/assist/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/assist/templates/ingress.yaml
index f791024bb..60bdcbe38 100644
--- a/scripts/helmcharts/openreplay/charts/assist/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/assist/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assist.labels" . | nindent 4 }}
   annotations:
diff --git a/scripts/helmcharts/openreplay/charts/assist/templates/service.yaml b/scripts/helmcharts/openreplay/charts/assist/templates/service.yaml
index 13b78654c..18d10427e 100644
--- a/scripts/helmcharts/openreplay/charts/assist/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/assist/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "assist.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assist.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/assist/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/assist/templates/serviceaccount.yaml
index 18e86a3e8..612245839 100644
--- a/scripts/helmcharts/openreplay/charts/assist/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/assist/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "assist.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "assist.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
index aa4154012..44cd3944d 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "chalice.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "chalice.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/hpa.yaml
index dc1cb12c1..8a2e193fb 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "chalice.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "chalice.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/ingress.yaml
index ee1120e06..d7ed9e591 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "chalice.labels" . | nindent 4 }}
   annotations:
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/service.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/service.yaml
index 9bb87743f..07f24efb3 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "chalice.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "chalice.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/serviceaccount.yaml
index 9af2e3ac4..cfab520ad 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "chalice.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "chalice.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml
index 16a63c61d..d5f6e4878 100644
--- a/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "db.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "db.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/db/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/db/templates/hpa.yaml
index 8dbac030f..4fd1e9e15 100644
--- a/scripts/helmcharts/openreplay/charts/db/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "db.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "db.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml
index d2818017c..c925dc772 100644
--- a/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "db.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/db/templates/service.yaml b/scripts/helmcharts/openreplay/charts/db/templates/service.yaml
index 4c968cc12..eb7cc1ec9 100644
--- a/scripts/helmcharts/openreplay/charts/db/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "db.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "db.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/db/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/db/templates/serviceaccount.yaml
index 80decdb84..1418cfbf4 100644
--- a/scripts/helmcharts/openreplay/charts/db/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "db.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "db.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml
index 739a2b36f..9d6efccb4 100644
--- a/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "ender.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "ender.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/hpa.yaml
index 62138535e..ba09a028b 100644
--- a/scripts/helmcharts/openreplay/charts/ender/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "ender.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "ender.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml
index 92d772378..37cd134e7 100644
--- a/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "ender.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/service.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/service.yaml
index d72fe8658..8af9bbe16 100644
--- a/scripts/helmcharts/openreplay/charts/ender/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "ender.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "ender.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/serviceaccount.yaml
index f85c1d07b..62eba310d 100644
--- a/scripts/helmcharts/openreplay/charts/ender/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "ender.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "ender.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
index d4805b398..99b73950e 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "frontend.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "frontend.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/hpa.yaml
index f1ffdc14a..f897d6382 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "frontend.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "frontend.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/ingress.yaml
index b1d67bb00..74a8037e1 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "frontend.labels" . | nindent 4 }}
   annotations:
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/service.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/service.yaml
index c94d62e2d..211116343 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "frontend.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "frontend.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/serviceaccount.yaml
index cc6490911..71dc91ab1 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "frontend.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "frontend.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml
index 028d5af75..69c498f19 100644
--- a/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "heuristics.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "heuristics.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/hpa.yaml
index 7b29f1426..e4514835e 100644
--- a/scripts/helmcharts/openreplay/charts/heuristics/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "heuristics.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "heuristics.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml
index 5f33f48e1..050dda911 100644
--- a/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "heuristics.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/service.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/service.yaml
index f8eb60b8d..311758230 100644
--- a/scripts/helmcharts/openreplay/charts/heuristics/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "heuristics.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "heuristics.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/serviceaccount.yaml
index 6bfd69d4c..398f81672 100644
--- a/scripts/helmcharts/openreplay/charts/heuristics/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "heuristics.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "heuristics.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
index daffc630c..1682fbe69 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "http.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "http.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/http/templates/hpa.yaml
index 8e88b2807..2ceeb047e 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "http.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "http.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/http/templates/ingress.yaml
index 7dc3368b3..070c4ead2 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "http.labels" . | nindent 4 }}
   annotations:
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/service.yaml b/scripts/helmcharts/openreplay/charts/http/templates/service.yaml
index 44a742b51..a247c4da5 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "http.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "http.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/http/templates/serviceaccount.yaml
index 7c55e5954..54c450f87 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "http.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "http.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml
index a1c03ae1e..1c6a6c6b8 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "integrations.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "integrations.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/hpa.yaml
index cb9cf17db..a4fac85e4 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "integrations.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "integrations.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml
index 10afe84e6..379d77834 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "integrations.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/service.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/service.yaml
index 2b93301de..eaef93930 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "integrations.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "integrations.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/serviceaccount.yaml
index 0bb50f48d..2a8e18148 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "integrations.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "integrations.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/peers/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/peers/templates/deployment.yaml
index e3c0a1ece..c7507887d 100644
--- a/scripts/helmcharts/openreplay/charts/peers/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/peers/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "peers.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peers.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/peers/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/peers/templates/hpa.yaml
index 7191631ee..814a60b98 100644
--- a/scripts/helmcharts/openreplay/charts/peers/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/peers/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "peers.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peers.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/peers/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/peers/templates/ingress.yaml
index 0da5eca0d..16e341004 100644
--- a/scripts/helmcharts/openreplay/charts/peers/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/peers/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peers.labels" . | nindent 4 }}
   annotations:
diff --git a/scripts/helmcharts/openreplay/charts/peers/templates/service.yaml b/scripts/helmcharts/openreplay/charts/peers/templates/service.yaml
index 3a069c2c2..22d493cd6 100644
--- a/scripts/helmcharts/openreplay/charts/peers/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/peers/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "peers.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peers.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/peers/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/peers/templates/serviceaccount.yaml
index 4b6cc04fd..8fd2d149c 100644
--- a/scripts/helmcharts/openreplay/charts/peers/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/peers/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "peers.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peers.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
index 0e55a0bac..d6ed8f740 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "sink.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "sink.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/hpa.yaml
index 8f9a98f79..25a0d6071 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "sink.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "sink.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml
index b7cd7fd99..4834fed1a 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "sink.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/service.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/service.yaml
index 709ec427d..35bc19851 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "sink.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "sink.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/serviceaccount.yaml
index 34986e78d..36101465d 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "sink.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "sink.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
index e6b0b6b0a..d5d247ddd 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "storage.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "storage.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/hpa.yaml
index d015e4bb2..f3c2b8829 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "storage.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "storage.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml
index 880b16f62..687c81061 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "storage.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/service.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/service.yaml
index 6764104fe..f39058921 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "storage.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "storage.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/serviceaccount.yaml
index a361acc50..259111cf9 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "storage.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "storage.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index 7a9a383b4..507e95129 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
@@ -2,6 +2,7 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: efs-cleaner
+  namespace: {{ .Release.Namespace }}
 spec:
   schedule: "{{ .Values.cron }}"
   failedJobsHistoryLimit: 1
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/hpa.yaml
index 8944056ea..7c7cd24e5 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "utilities.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "utilities.labels" . | nindent 4 }}
 spec:
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/ingress.yaml
index bb061e810..5cc2ac5d0 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "utilities.labels" . | nindent 4 }}
   annotations:
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/serviceaccount.yaml
index dd5c35012..e7b35b86f 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "utilities.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "utilities.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}