From e0b656b3de9b6fdefdffe337b080b2797ea538de Mon Sep 17 00:00:00 2001
From: mchtech <michu_an@126.com>
Date: Fri, 8 Mar 2024 11:29:01 +0800
Subject: [PATCH 1/2] add namespace metadata

Signed-off-by: mchtech <michu_an@126.com>
---
 charts/milvus/templates/attu-deployment.yaml       | 1 +
 charts/milvus/templates/attu-ingress.yaml          | 1 +
 charts/milvus/templates/attu-svc.yaml              | 1 +
 charts/milvus/templates/configmap.yaml             | 1 +
 charts/milvus/templates/datacoord-deployment.yaml  | 1 +
 charts/milvus/templates/datacoord-svc.yaml         | 1 +
 charts/milvus/templates/datanode-deployment.yaml   | 1 +
 charts/milvus/templates/datanode-svc.yaml          | 1 +
 charts/milvus/templates/indexcoord-deployment.yaml | 1 +
 charts/milvus/templates/indexcoord-svc.yaml        | 1 +
 charts/milvus/templates/indexnode-deployment.yaml  | 1 +
 charts/milvus/templates/indexnode-svc.yaml         | 1 +
 charts/milvus/templates/ingress.yaml               | 2 ++
 charts/milvus/templates/mixcoord-deployment.yaml   | 1 +
 charts/milvus/templates/mixcoord-svc.yaml          | 1 +
 charts/milvus/templates/proxy-deployment.yaml      | 1 +
 charts/milvus/templates/proxy-tls-secret.yaml      | 1 +
 charts/milvus/templates/pulsar-podmonitor.yaml     | 2 ++
 charts/milvus/templates/pvc.yaml                   | 2 ++
 charts/milvus/templates/querycoord-deployment.yaml | 1 +
 charts/milvus/templates/querycoord-svc.yaml        | 1 +
 charts/milvus/templates/querynode-deployment.yaml  | 1 +
 charts/milvus/templates/querynode-svc.yaml         | 1 +
 charts/milvus/templates/rootcoord-deployment.yaml  | 1 +
 charts/milvus/templates/rootcoord-svc.yaml         | 1 +
 charts/milvus/templates/service.yaml               | 1 +
 charts/milvus/templates/serviceaccount.yaml        | 1 +
 charts/milvus/templates/servicemonitor.yaml        | 2 ++
 charts/milvus/templates/standalone-deployment.yaml | 1 +
 29 files changed, 33 insertions(+)

diff --git a/charts/milvus/templates/attu-deployment.yaml b/charts/milvus/templates/attu-deployment.yaml
index 5e11abb..8496776 100644
--- a/charts/milvus/templates/attu-deployment.yaml
+++ b/charts/milvus/templates/attu-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "attu"
diff --git a/charts/milvus/templates/attu-ingress.yaml b/charts/milvus/templates/attu-ingress.yaml
index 637481e..c65ff74 100644
--- a/charts/milvus/templates/attu-ingress.yaml
+++ b/charts/milvus/templates/attu-ingress.yaml
@@ -7,6 +7,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.attu.ingress.labels }}
diff --git a/charts/milvus/templates/attu-svc.yaml b/charts/milvus/templates/attu-svc.yaml
index edff6f6..b39d73f 100644
--- a/charts/milvus/templates/attu-svc.yaml
+++ b/charts/milvus/templates/attu-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.attu.service.labels }}
diff --git a/charts/milvus/templates/configmap.yaml b/charts/milvus/templates/configmap.yaml
index 68cc099..a77f2a8 100644
--- a/charts/milvus/templates/configmap.yaml
+++ b/charts/milvus/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "milvus.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
 data:
   default.yaml: |+
     {{- include "milvus.config" . | nindent 4 }}
diff --git a/charts/milvus/templates/datacoord-deployment.yaml b/charts/milvus/templates/datacoord-deployment.yaml
index 34d00b4..4cfb4ef 100644
--- a/charts/milvus/templates/datacoord-deployment.yaml
+++ b/charts/milvus/templates/datacoord-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.datacoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "datacoord"
diff --git a/charts/milvus/templates/datacoord-svc.yaml b/charts/milvus/templates/datacoord-svc.yaml
index c30e2ba..4a95902 100644
--- a/charts/milvus/templates/datacoord-svc.yaml
+++ b/charts/milvus/templates/datacoord-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.datacoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.dataCoordinator.service.labels }}
diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml
index ef88a3b..93a1a20 100644
--- a/charts/milvus/templates/datanode-deployment.yaml
+++ b/charts/milvus/templates/datanode-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.datanode.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "datanode"
diff --git a/charts/milvus/templates/datanode-svc.yaml b/charts/milvus/templates/datanode-svc.yaml
index 4891938..8e73e59 100644
--- a/charts/milvus/templates/datanode-svc.yaml
+++ b/charts/milvus/templates/datanode-svc.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.datanode.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "datanode"
diff --git a/charts/milvus/templates/indexcoord-deployment.yaml b/charts/milvus/templates/indexcoord-deployment.yaml
index f876943..8b85ef6 100644
--- a/charts/milvus/templates/indexcoord-deployment.yaml
+++ b/charts/milvus/templates/indexcoord-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.indexcoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "indexcoord"
diff --git a/charts/milvus/templates/indexcoord-svc.yaml b/charts/milvus/templates/indexcoord-svc.yaml
index a91b02e..c929253 100644
--- a/charts/milvus/templates/indexcoord-svc.yaml
+++ b/charts/milvus/templates/indexcoord-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.indexcoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.indexCoordinator.service.labels }}
diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml
index 2303f4a..d3f9105 100644
--- a/charts/milvus/templates/indexnode-deployment.yaml
+++ b/charts/milvus/templates/indexnode-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.indexnode.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "indexnode"
diff --git a/charts/milvus/templates/indexnode-svc.yaml b/charts/milvus/templates/indexnode-svc.yaml
index 5110e54..aad5f78 100644
--- a/charts/milvus/templates/indexnode-svc.yaml
+++ b/charts/milvus/templates/indexnode-svc.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.indexnode.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "indexnode"
diff --git a/charts/milvus/templates/ingress.yaml b/charts/milvus/templates/ingress.yaml
index 0c78a00..ee3ff25 100644
--- a/charts/milvus/templates/ingress.yaml
+++ b/charts/milvus/templates/ingress.yaml
@@ -7,6 +7,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "milvus.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.ingress.labels }}
@@ -54,6 +55,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "milvus.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.ingress.labels }}
diff --git a/charts/milvus/templates/mixcoord-deployment.yaml b/charts/milvus/templates/mixcoord-deployment.yaml
index 86ab063..7f110a8 100644
--- a/charts/milvus/templates/mixcoord-deployment.yaml
+++ b/charts/milvus/templates/mixcoord-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.mixcoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "mixcoord"
diff --git a/charts/milvus/templates/mixcoord-svc.yaml b/charts/milvus/templates/mixcoord-svc.yaml
index 5b0b508..58ab69d 100644
--- a/charts/milvus/templates/mixcoord-svc.yaml
+++ b/charts/milvus/templates/mixcoord-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.mixcoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.mixCoordinator.service.labels }}
diff --git a/charts/milvus/templates/proxy-deployment.yaml b/charts/milvus/templates/proxy-deployment.yaml
index f9c278f..2a17168 100644
--- a/charts/milvus/templates/proxy-deployment.yaml
+++ b/charts/milvus/templates/proxy-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.proxy.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "proxy"
diff --git a/charts/milvus/templates/proxy-tls-secret.yaml b/charts/milvus/templates/proxy-tls-secret.yaml
index 1e746f7..3335e8a 100644
--- a/charts/milvus/templates/proxy-tls-secret.yaml
+++ b/charts/milvus/templates/proxy-tls-secret.yaml
@@ -6,6 +6,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.proxy.tls.secretName }}
+  namespace: {{ .Release.Namespace | quote }}
 data:
   tls.crt: {{ .Values.proxy.tls.crt }}
   tls.key: {{ .Values.proxy.tls.key }}
diff --git a/charts/milvus/templates/pulsar-podmonitor.yaml b/charts/milvus/templates/pulsar-podmonitor.yaml
index 6179e2c..ba740ca 100644
--- a/charts/milvus/templates/pulsar-podmonitor.yaml
+++ b/charts/milvus/templates/pulsar-podmonitor.yaml
@@ -5,6 +5,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ template "milvus.pulsar.fullname" . }}-broker
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: pulsar
     cluster: {{ template "milvus.pulsar.fullname" .}}
@@ -31,6 +32,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ template "milvus.pulsar.fullname" . }}-proxy
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: pulsar
     cluster: {{ template "milvus.pulsar.fullname" .}}
diff --git a/charts/milvus/templates/pvc.yaml b/charts/milvus/templates/pvc.yaml
index b0da8a5..4456d50 100644
--- a/charts/milvus/templates/pvc.yaml
+++ b/charts/milvus/templates/pvc.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ printf "%s" (include "milvus.fullname" . | trunc 58)}}
+  namespace: {{ .Release.Namespace | quote }}
 {{- with .Values.standalone.persistence.annotations  }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -36,6 +37,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ printf "%s-logs" (include "milvus.fullname" . | trunc 58)}}
+  namespace: {{ .Release.Namespace | quote }}
 {{- with .Values.log.persistence.annotations  }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/milvus/templates/querycoord-deployment.yaml b/charts/milvus/templates/querycoord-deployment.yaml
index e3159c9..df47f63 100644
--- a/charts/milvus/templates/querycoord-deployment.yaml
+++ b/charts/milvus/templates/querycoord-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.querycoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "querycoord"
diff --git a/charts/milvus/templates/querycoord-svc.yaml b/charts/milvus/templates/querycoord-svc.yaml
index 57e8b0a..ebcc2d0 100644
--- a/charts/milvus/templates/querycoord-svc.yaml
+++ b/charts/milvus/templates/querycoord-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.querycoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.queryCoordinator.service.labels }}
diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml
index c470aa5..3ca55aa 100644
--- a/charts/milvus/templates/querynode-deployment.yaml
+++ b/charts/milvus/templates/querynode-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.querynode.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "querynode"
diff --git a/charts/milvus/templates/querynode-svc.yaml b/charts/milvus/templates/querynode-svc.yaml
index 888965d..def3a1d 100644
--- a/charts/milvus/templates/querynode-svc.yaml
+++ b/charts/milvus/templates/querynode-svc.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.querynode.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "querynode"
diff --git a/charts/milvus/templates/rootcoord-deployment.yaml b/charts/milvus/templates/rootcoord-deployment.yaml
index 2e16efe..5b7bbde 100644
--- a/charts/milvus/templates/rootcoord-deployment.yaml
+++ b/charts/milvus/templates/rootcoord-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.rootcoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "rootcoord"
diff --git a/charts/milvus/templates/rootcoord-svc.yaml b/charts/milvus/templates/rootcoord-svc.yaml
index 31fa2da..74c54cb 100644
--- a/charts/milvus/templates/rootcoord-svc.yaml
+++ b/charts/milvus/templates/rootcoord-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.rootcoord.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.rootCoordinator.service.labels }}
diff --git a/charts/milvus/templates/service.yaml b/charts/milvus/templates/service.yaml
index b76d123..b89fc6a 100644
--- a/charts/milvus/templates/service.yaml
+++ b/charts/milvus/templates/service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.service.labels }}
diff --git a/charts/milvus/templates/serviceaccount.yaml b/charts/milvus/templates/serviceaccount.yaml
index 1ed37e1..b3678f9 100644
--- a/charts/milvus/templates/serviceaccount.yaml
+++ b/charts/milvus/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "milvus.serviceAccount" . }}
+  namespace: {{ .Release.Namespace | quote }}
 {{- if .Values.serviceAccount.annotations }}
   annotations:
 {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
diff --git a/charts/milvus/templates/servicemonitor.yaml b/charts/milvus/templates/servicemonitor.yaml
index ba8048f..661af3d 100644
--- a/charts/milvus/templates/servicemonitor.yaml
+++ b/charts/milvus/templates/servicemonitor.yaml
@@ -5,6 +5,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "milvus.standalone.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     {{- if .Values.metrics.serviceMonitor.additionalLabels }}
@@ -37,6 +38,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "milvus.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     {{- if .Values.metrics.serviceMonitor.additionalLabels }}
diff --git a/charts/milvus/templates/standalone-deployment.yaml b/charts/milvus/templates/standalone-deployment.yaml
index 26c59f5..5f88342 100644
--- a/charts/milvus/templates/standalone-deployment.yaml
+++ b/charts/milvus/templates/standalone-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.standalone.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "standalone"

From b46a54194799ac6427cfcabd23ea888b029d5a50 Mon Sep 17 00:00:00 2001
From: mchtech <michu_an@126.com>
Date: Fri, 8 Mar 2024 11:29:08 +0800
Subject: [PATCH 2/2] add namespace metadata

Signed-off-by: mchtech <michu_an@126.com>
---
 charts/milvus/templates/attu-deployment.yaml                  | 2 +-
 charts/milvus/templates/attu-ingress.yaml                     | 3 ++-
 charts/milvus/templates/attu-svc.yaml                         | 2 +-
 charts/milvus/templates/configmap.yaml                        | 2 +-
 charts/milvus/templates/datacoord-deployment.yaml             | 2 +-
 charts/milvus/templates/datacoord-svc.yaml                    | 2 +-
 charts/milvus/templates/datanode-deployment.yaml              | 2 +-
 charts/milvus/templates/datanode-svc.yaml                     | 2 +-
 charts/milvus/templates/indexcoord-deployment.yaml            | 2 +-
 charts/milvus/templates/indexcoord-svc.yaml                   | 2 +-
 charts/milvus/templates/indexnode-deployment.yaml             | 2 +-
 charts/milvus/templates/indexnode-svc.yaml                    | 2 +-
 charts/milvus/templates/ingress.yaml                          | 4 ++--
 charts/milvus/templates/mixcoord-deployment.yaml              | 2 +-
 charts/milvus/templates/mixcoord-svc.yaml                     | 2 +-
 charts/milvus/templates/proxy-deployment.yaml                 | 2 +-
 charts/milvus/templates/proxy-tls-secret.yaml                 | 2 +-
 charts/milvus/templates/pulsar-podmonitor.yaml                | 4 ++--
 charts/milvus/templates/pvc.yaml                              | 4 ++--
 charts/milvus/templates/querycoord-deployment.yaml            | 2 +-
 charts/milvus/templates/querycoord-svc.yaml                   | 2 +-
 charts/milvus/templates/querynode-deployment.yaml             | 2 +-
 charts/milvus/templates/querynode-svc.yaml                    | 2 +-
 charts/milvus/templates/rootcoord-deployment.yaml             | 2 +-
 charts/milvus/templates/rootcoord-svc.yaml                    | 2 +-
 charts/milvus/templates/service.yaml                          | 2 +-
 charts/milvus/templates/serviceaccount.yaml                   | 2 +-
 charts/milvus/templates/servicemonitor.yaml                   | 4 ++--
 charts/milvus/templates/standalone-deployment.yaml            | 2 +-
 charts/minio/templates/configmap.yaml                         | 1 +
 charts/minio/templates/deployment.yaml                        | 1 +
 charts/minio/templates/ingress.yaml                           | 1 +
 charts/minio/templates/networkpolicy.yaml                     | 1 +
 charts/minio/templates/poddisruptionbudget.yaml               | 1 +
 charts/minio/templates/podmonitor.yaml                        | 1 +
 charts/minio/templates/post-install-create-bucket-job.yaml    | 1 +
 .../minio/templates/post-install-prometheus-metrics-job.yaml  | 1 +
 .../minio/templates/post-install-prometheus-metrics-role.yaml | 1 +
 .../post-install-prometheus-metrics-rolebinding.yaml          | 1 +
 .../post-install-prometheus-metrics-serviceaccount.yaml       | 1 +
 charts/minio/templates/pvc.yaml                               | 1 +
 charts/minio/templates/secrets.yaml                           | 1 +
 charts/minio/templates/securitycontextconstraints.yaml        | 1 +
 charts/minio/templates/service.yaml                           | 1 +
 charts/minio/templates/statefulset.yaml                       | 2 ++
 45 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/charts/milvus/templates/attu-deployment.yaml b/charts/milvus/templates/attu-deployment.yaml
index 8496776..c8b06ea 100644
--- a/charts/milvus/templates/attu-deployment.yaml
+++ b/charts/milvus/templates/attu-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "attu"
diff --git a/charts/milvus/templates/attu-ingress.yaml b/charts/milvus/templates/attu-ingress.yaml
index c65ff74..a331aaa 100644
--- a/charts/milvus/templates/attu-ingress.yaml
+++ b/charts/milvus/templates/attu-ingress.yaml
@@ -7,7 +7,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.attu.ingress.labels }}
@@ -57,6 +57,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.attu.ingress.labels }}
diff --git a/charts/milvus/templates/attu-svc.yaml b/charts/milvus/templates/attu-svc.yaml
index b39d73f..cb85ccb 100644
--- a/charts/milvus/templates/attu-svc.yaml
+++ b/charts/milvus/templates/attu-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.attu.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.attu.service.labels }}
diff --git a/charts/milvus/templates/configmap.yaml b/charts/milvus/templates/configmap.yaml
index a77f2a8..36960e9 100644
--- a/charts/milvus/templates/configmap.yaml
+++ b/charts/milvus/templates/configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "milvus.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
 data:
   default.yaml: |+
     {{- include "milvus.config" . | nindent 4 }}
diff --git a/charts/milvus/templates/datacoord-deployment.yaml b/charts/milvus/templates/datacoord-deployment.yaml
index 4cfb4ef..e722c29 100644
--- a/charts/milvus/templates/datacoord-deployment.yaml
+++ b/charts/milvus/templates/datacoord-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.datacoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "datacoord"
diff --git a/charts/milvus/templates/datacoord-svc.yaml b/charts/milvus/templates/datacoord-svc.yaml
index 4a95902..c2b4703 100644
--- a/charts/milvus/templates/datacoord-svc.yaml
+++ b/charts/milvus/templates/datacoord-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.datacoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.dataCoordinator.service.labels }}
diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml
index 93a1a20..5c34c46 100644
--- a/charts/milvus/templates/datanode-deployment.yaml
+++ b/charts/milvus/templates/datanode-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.datanode.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "datanode"
diff --git a/charts/milvus/templates/datanode-svc.yaml b/charts/milvus/templates/datanode-svc.yaml
index 8e73e59..5cd5e3f 100644
--- a/charts/milvus/templates/datanode-svc.yaml
+++ b/charts/milvus/templates/datanode-svc.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.datanode.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "datanode"
diff --git a/charts/milvus/templates/indexcoord-deployment.yaml b/charts/milvus/templates/indexcoord-deployment.yaml
index 8b85ef6..9bd4eff 100644
--- a/charts/milvus/templates/indexcoord-deployment.yaml
+++ b/charts/milvus/templates/indexcoord-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.indexcoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "indexcoord"
diff --git a/charts/milvus/templates/indexcoord-svc.yaml b/charts/milvus/templates/indexcoord-svc.yaml
index c929253..cb47b4f 100644
--- a/charts/milvus/templates/indexcoord-svc.yaml
+++ b/charts/milvus/templates/indexcoord-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.indexcoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.indexCoordinator.service.labels }}
diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml
index d3f9105..f52d778 100644
--- a/charts/milvus/templates/indexnode-deployment.yaml
+++ b/charts/milvus/templates/indexnode-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.indexnode.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "indexnode"
diff --git a/charts/milvus/templates/indexnode-svc.yaml b/charts/milvus/templates/indexnode-svc.yaml
index aad5f78..2f4089a 100644
--- a/charts/milvus/templates/indexnode-svc.yaml
+++ b/charts/milvus/templates/indexnode-svc.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.indexnode.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "indexnode"
diff --git a/charts/milvus/templates/ingress.yaml b/charts/milvus/templates/ingress.yaml
index ee3ff25..ca83225 100644
--- a/charts/milvus/templates/ingress.yaml
+++ b/charts/milvus/templates/ingress.yaml
@@ -7,7 +7,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "milvus.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.ingress.labels }}
@@ -55,7 +55,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "milvus.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.ingress.labels }}
diff --git a/charts/milvus/templates/mixcoord-deployment.yaml b/charts/milvus/templates/mixcoord-deployment.yaml
index 7f110a8..a2c1020 100644
--- a/charts/milvus/templates/mixcoord-deployment.yaml
+++ b/charts/milvus/templates/mixcoord-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.mixcoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "mixcoord"
diff --git a/charts/milvus/templates/mixcoord-svc.yaml b/charts/milvus/templates/mixcoord-svc.yaml
index 58ab69d..bacf225 100644
--- a/charts/milvus/templates/mixcoord-svc.yaml
+++ b/charts/milvus/templates/mixcoord-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.mixcoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.mixCoordinator.service.labels }}
diff --git a/charts/milvus/templates/proxy-deployment.yaml b/charts/milvus/templates/proxy-deployment.yaml
index 2a17168..f022b3b 100644
--- a/charts/milvus/templates/proxy-deployment.yaml
+++ b/charts/milvus/templates/proxy-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.proxy.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "proxy"
diff --git a/charts/milvus/templates/proxy-tls-secret.yaml b/charts/milvus/templates/proxy-tls-secret.yaml
index 3335e8a..ddaa546 100644
--- a/charts/milvus/templates/proxy-tls-secret.yaml
+++ b/charts/milvus/templates/proxy-tls-secret.yaml
@@ -6,7 +6,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.proxy.tls.secretName }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
 data:
   tls.crt: {{ .Values.proxy.tls.crt }}
   tls.key: {{ .Values.proxy.tls.key }}
diff --git a/charts/milvus/templates/pulsar-podmonitor.yaml b/charts/milvus/templates/pulsar-podmonitor.yaml
index ba740ca..99039cd 100644
--- a/charts/milvus/templates/pulsar-podmonitor.yaml
+++ b/charts/milvus/templates/pulsar-podmonitor.yaml
@@ -5,7 +5,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ template "milvus.pulsar.fullname" . }}-broker
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: pulsar
     cluster: {{ template "milvus.pulsar.fullname" .}}
@@ -32,7 +32,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ template "milvus.pulsar.fullname" . }}-proxy
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: pulsar
     cluster: {{ template "milvus.pulsar.fullname" .}}
diff --git a/charts/milvus/templates/pvc.yaml b/charts/milvus/templates/pvc.yaml
index 4456d50..398e768 100644
--- a/charts/milvus/templates/pvc.yaml
+++ b/charts/milvus/templates/pvc.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ printf "%s" (include "milvus.fullname" . | trunc 58)}}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
 {{- with .Values.standalone.persistence.annotations  }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -37,7 +37,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ printf "%s-logs" (include "milvus.fullname" . | trunc 58)}}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
 {{- with .Values.log.persistence.annotations  }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/milvus/templates/querycoord-deployment.yaml b/charts/milvus/templates/querycoord-deployment.yaml
index df47f63..26e9768 100644
--- a/charts/milvus/templates/querycoord-deployment.yaml
+++ b/charts/milvus/templates/querycoord-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.querycoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "querycoord"
diff --git a/charts/milvus/templates/querycoord-svc.yaml b/charts/milvus/templates/querycoord-svc.yaml
index ebcc2d0..d69a4d0 100644
--- a/charts/milvus/templates/querycoord-svc.yaml
+++ b/charts/milvus/templates/querycoord-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.querycoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.queryCoordinator.service.labels }}
diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml
index 3ca55aa..ec8aa69 100644
--- a/charts/milvus/templates/querynode-deployment.yaml
+++ b/charts/milvus/templates/querynode-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.querynode.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "querynode"
diff --git a/charts/milvus/templates/querynode-svc.yaml b/charts/milvus/templates/querynode-svc.yaml
index def3a1d..d45a7c7 100644
--- a/charts/milvus/templates/querynode-svc.yaml
+++ b/charts/milvus/templates/querynode-svc.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.querynode.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "querynode"
diff --git a/charts/milvus/templates/rootcoord-deployment.yaml b/charts/milvus/templates/rootcoord-deployment.yaml
index 5b7bbde..0a2dddf 100644
--- a/charts/milvus/templates/rootcoord-deployment.yaml
+++ b/charts/milvus/templates/rootcoord-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.rootcoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "rootcoord"
diff --git a/charts/milvus/templates/rootcoord-svc.yaml b/charts/milvus/templates/rootcoord-svc.yaml
index 74c54cb..a30809e 100644
--- a/charts/milvus/templates/rootcoord-svc.yaml
+++ b/charts/milvus/templates/rootcoord-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.rootcoord.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.rootCoordinator.service.labels }}
diff --git a/charts/milvus/templates/service.yaml b/charts/milvus/templates/service.yaml
index b89fc6a..91f39bc 100644
--- a/charts/milvus/templates/service.yaml
+++ b/charts/milvus/templates/service.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "milvus.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
 {{- if .Values.service.labels }}
diff --git a/charts/milvus/templates/serviceaccount.yaml b/charts/milvus/templates/serviceaccount.yaml
index b3678f9..4b16c75 100644
--- a/charts/milvus/templates/serviceaccount.yaml
+++ b/charts/milvus/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "milvus.serviceAccount" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
 {{- if .Values.serviceAccount.annotations }}
   annotations:
 {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
diff --git a/charts/milvus/templates/servicemonitor.yaml b/charts/milvus/templates/servicemonitor.yaml
index 661af3d..49a51d8 100644
--- a/charts/milvus/templates/servicemonitor.yaml
+++ b/charts/milvus/templates/servicemonitor.yaml
@@ -5,7 +5,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "milvus.standalone.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     {{- if .Values.metrics.serviceMonitor.additionalLabels }}
@@ -38,7 +38,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "milvus.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     {{- if .Values.metrics.serviceMonitor.additionalLabels }}
diff --git a/charts/milvus/templates/standalone-deployment.yaml b/charts/milvus/templates/standalone-deployment.yaml
index 5f88342..0d00ff5 100644
--- a/charts/milvus/templates/standalone-deployment.yaml
+++ b/charts/milvus/templates/standalone-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "milvus.standalone.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "milvus.labels" . | indent 4 }}
     component: "standalone"
diff --git a/charts/minio/templates/configmap.yaml b/charts/minio/templates/configmap.yaml
index cb11fcd..e06fe4c 100644
--- a/charts/minio/templates/configmap.yaml
+++ b/charts/minio/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/deployment.yaml b/charts/minio/templates/deployment.yaml
index ffa880b..6f93d29 100644
--- a/charts/minio/templates/deployment.yaml
+++ b/charts/minio/templates/deployment.yaml
@@ -8,6 +8,7 @@ apiVersion: {{ template "minio.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/ingress.yaml b/charts/minio/templates/ingress.yaml
index 2d9bbda..e3f99e4 100644
--- a/charts/minio/templates/ingress.yaml
+++ b/charts/minio/templates/ingress.yaml
@@ -6,6 +6,7 @@ apiVersion: {{ template "minio.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/networkpolicy.yaml b/charts/minio/templates/networkpolicy.yaml
index de57f48..bb56e3c 100644
--- a/charts/minio/templates/networkpolicy.yaml
+++ b/charts/minio/templates/networkpolicy.yaml
@@ -3,6 +3,7 @@ kind: NetworkPolicy
 apiVersion: {{ template "minio.networkPolicy.apiVersion" . }}
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/poddisruptionbudget.yaml b/charts/minio/templates/poddisruptionbudget.yaml
index dce1335..735457f 100644
--- a/charts/minio/templates/poddisruptionbudget.yaml
+++ b/charts/minio/templates/poddisruptionbudget.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ template "minio.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: minio
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
 spec:
diff --git a/charts/minio/templates/podmonitor.yaml b/charts/minio/templates/podmonitor.yaml
index 0bd969f..16222d9 100644
--- a/charts/minio/templates/podmonitor.yaml
+++ b/charts/minio/templates/podmonitor.yaml
@@ -7,6 +7,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     release: {{ .Release.Name }}
diff --git a/charts/minio/templates/post-install-create-bucket-job.yaml b/charts/minio/templates/post-install-create-bucket-job.yaml
index 27e30d4..59c4c0f 100644
--- a/charts/minio/templates/post-install-create-bucket-job.yaml
+++ b/charts/minio/templates/post-install-create-bucket-job.yaml
@@ -3,6 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ template "minio.fullname" . }}-make-bucket-job
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}-make-bucket-job
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/post-install-prometheus-metrics-job.yaml b/charts/minio/templates/post-install-prometheus-metrics-job.yaml
index 3091a94..db6af1e 100644
--- a/charts/minio/templates/post-install-prometheus-metrics-job.yaml
+++ b/charts/minio/templates/post-install-prometheus-metrics-job.yaml
@@ -8,6 +8,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $fullName }}-update-prometheus-secret
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}-update-prometheus-secret
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/post-install-prometheus-metrics-role.yaml b/charts/minio/templates/post-install-prometheus-metrics-role.yaml
index fe07bf8..286d644 100644
--- a/charts/minio/templates/post-install-prometheus-metrics-role.yaml
+++ b/charts/minio/templates/post-install-prometheus-metrics-role.yaml
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ $fullName }}-update-prometheus-secret
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}-update-prometheus-secret
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml b/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml
index 9daf50d..d560e73 100644
--- a/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml
+++ b/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ $fullName }}-update-prometheus-secret
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}-update-prometheus-secret
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/post-install-prometheus-metrics-serviceaccount.yaml b/charts/minio/templates/post-install-prometheus-metrics-serviceaccount.yaml
index a704b53..bdf568b 100644
--- a/charts/minio/templates/post-install-prometheus-metrics-serviceaccount.yaml
+++ b/charts/minio/templates/post-install-prometheus-metrics-serviceaccount.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ $fullName }}-update-prometheus-secret
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}-update-prometheus-secret
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/pvc.yaml b/charts/minio/templates/pvc.yaml
index 99f0fd4..4c7c0f5 100644
--- a/charts/minio/templates/pvc.yaml
+++ b/charts/minio/templates/pvc.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   {{- with .Values.persistence.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/minio/templates/secrets.yaml b/charts/minio/templates/secrets.yaml
index c254142..4f57284 100644
--- a/charts/minio/templates/secrets.yaml
+++ b/charts/minio/templates/secrets.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "minio.secretName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/securitycontextconstraints.yaml b/charts/minio/templates/securitycontextconstraints.yaml
index 4bac7e3..7669195 100644
--- a/charts/minio/templates/securitycontextconstraints.yaml
+++ b/charts/minio/templates/securitycontextconstraints.yaml
@@ -3,6 +3,7 @@ apiVersion: security.openshift.io/v1
 kind: SecurityContextConstraints
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/service.yaml b/charts/minio/templates/service.yaml
index ea681e2..1019c1d 100644
--- a/charts/minio/templates/service.yaml
+++ b/charts/minio/templates/service.yaml
@@ -6,6 +6,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
diff --git a/charts/minio/templates/statefulset.yaml b/charts/minio/templates/statefulset.yaml
index ff16079..52dcfd7 100644
--- a/charts/minio/templates/statefulset.yaml
+++ b/charts/minio/templates/statefulset.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "minio.fullname" . }}-svc
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}
@@ -37,6 +38,7 @@ apiVersion: {{ template "minio.statefulset.apiVersion" . }}
 kind: StatefulSet
 metadata:
   name: {{ template "minio.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "minio.name" . }}
     chart: {{ template "minio.chart" . }}