From 3805883e160432ddbd9711de576900399bda805c Mon Sep 17 00:00:00 2001
From: Vighneshwar Madas <94487632+iamvighnesh@users.noreply.github.com>
Date: Wed, 14 May 2025 13:34:18 +0000
Subject: [PATCH 1/4] Migrate to using helm release namespace

---
 build/package/peerd-helm/templates/_helpers.tpl           | 8 --------
 .../peerd-helm/templates/events-clusterrolebinding.yml    | 2 +-
 build/package/peerd-helm/templates/peerd-ds.yml           | 2 +-
 .../peerd-helm/templates/peerd-manager-role-binding.yml   | 4 ++--
 build/package/peerd-helm/templates/peerd-manager-role.yml | 2 +-
 build/package/peerd-helm/templates/peerd-ns.yml           | 6 ------
 build/package/peerd-helm/templates/peerd-sa-secret.yml    | 2 +-
 build/package/peerd-helm/templates/peerd-sa.yml           | 2 +-
 build/package/peerd-helm/templates/peerd-svc.yml          | 2 +-
 build/package/peerd-helm/values.yaml                      | 4 ----
 docs/usage.md                                             | 4 ++--
 11 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 build/package/peerd-helm/templates/peerd-ns.yml

diff --git a/build/package/peerd-helm/templates/_helpers.tpl b/build/package/peerd-helm/templates/_helpers.tpl
index f7fd591..5f6f2c1 100644
--- a/build/package/peerd-helm/templates/_helpers.tpl
+++ b/build/package/peerd-helm/templates/_helpers.tpl
@@ -5,14 +5,6 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{- define "peerd.namespace" -}}
-{{- if .Values.peerd.namespace.k8s }}
-{{- .Values.peerd.namespace.k8s }}
-{{- else }}
-{{ include "peerd.name" . }}-ns
-{{- end }}
-{{- end }}
-
 {{- define "peerd.serviceAccountName" -}}
 {{ include "peerd.name" . }}-sa
 {{- end }}
diff --git a/build/package/peerd-helm/templates/events-clusterrolebinding.yml b/build/package/peerd-helm/templates/events-clusterrolebinding.yml
index 1567359..9d16e2e 100644
--- a/build/package/peerd-helm/templates/events-clusterrolebinding.yml
+++ b/build/package/peerd-helm/templates/events-clusterrolebinding.yml
@@ -7,7 +7,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: {{ include "peerd.serviceAccountName" . }}
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: node-reader-and-event-creator-clusterrole
diff --git a/build/package/peerd-helm/templates/peerd-ds.yml b/build/package/peerd-helm/templates/peerd-ds.yml
index af39d88..db95b73 100644
--- a/build/package/peerd-helm/templates/peerd-ds.yml
+++ b/build/package/peerd-helm/templates/peerd-ds.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: &name {{ include "peerd.name" . }}
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 {{- if .Values.peerd.metrics.prometheus.aksAutoDiscovery }}
diff --git a/build/package/peerd-helm/templates/peerd-manager-role-binding.yml b/build/package/peerd-helm/templates/peerd-manager-role-binding.yml
index b2592ec..56ae75a 100644
--- a/build/package/peerd-helm/templates/peerd-manager-role-binding.yml
+++ b/build/package/peerd-helm/templates/peerd-manager-role-binding.yml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "peerd.name" . }}-manager-role-binding
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 roleRef:
@@ -12,4 +12,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "peerd.serviceAccountName" . }}
-    namespace: {{ include "peerd.namespace" . }}
+    namespace: {{ .Release.Namespace }}
diff --git a/build/package/peerd-helm/templates/peerd-manager-role.yml b/build/package/peerd-helm/templates/peerd-manager-role.yml
index 90f4b92..9555a4b 100644
--- a/build/package/peerd-helm/templates/peerd-manager-role.yml
+++ b/build/package/peerd-helm/templates/peerd-manager-role.yml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "peerd.name" . }}-manager-role
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 rules:
diff --git a/build/package/peerd-helm/templates/peerd-ns.yml b/build/package/peerd-helm/templates/peerd-ns.yml
deleted file mode 100644
index c05adcc..0000000
--- a/build/package/peerd-helm/templates/peerd-ns.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ include "peerd.namespace" . }}
-  labels:
-    {{- include "peerd.labels" . | nindent 4 }}
diff --git a/build/package/peerd-helm/templates/peerd-sa-secret.yml b/build/package/peerd-helm/templates/peerd-sa-secret.yml
index 67add0e..50b7ce4 100644
--- a/build/package/peerd-helm/templates/peerd-sa-secret.yml
+++ b/build/package/peerd-helm/templates/peerd-sa-secret.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "peerd.serviceAccountName" . }}-secret
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
   annotations:
diff --git a/build/package/peerd-helm/templates/peerd-sa.yml b/build/package/peerd-helm/templates/peerd-sa.yml
index 273295e..7b147cc 100644
--- a/build/package/peerd-helm/templates/peerd-sa.yml
+++ b/build/package/peerd-helm/templates/peerd-sa.yml
@@ -2,6 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "peerd.serviceAccountName" . }}
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
diff --git a/build/package/peerd-helm/templates/peerd-svc.yml b/build/package/peerd-helm/templates/peerd-svc.yml
index d8a062e..f3ef36b 100644
--- a/build/package/peerd-helm/templates/peerd-svc.yml
+++ b/build/package/peerd-helm/templates/peerd-svc.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: &name {{ include "peerd.name" . }}
-  namespace: {{ include "peerd.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 {{- if .Values.peerd.metrics.prometheus.aksAutoDiscovery }}
diff --git a/build/package/peerd-helm/values.yaml b/build/package/peerd-helm/values.yaml
index 1ccf62c..eb9b712 100644
--- a/build/package/peerd-helm/values.yaml
+++ b/build/package/peerd-helm/values.yaml
@@ -19,10 +19,6 @@ peerd:
       # See: https://learn.microsoft.com/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration?tabs=CRDConfig%2CCRDScrapeConfig#configmaps
       aksAutoDiscovery: true
 
-  namespace:
-    # The kubernetes namespace for pod deployment and leader election.
-    k8s: peerd-ns
-
   resources:
     limits:
       cpu: "1000m"
diff --git a/docs/usage.md b/docs/usage.md
index c8a5351..f7d6d03 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -44,7 +44,7 @@ To run the tool:
 
 ```bash
 CLUSTER_CONTEXT=<your-cluster-context> && \
-  helm --kube-context=$CLUSTER_CONTEXT install --wait overlaybd ./tools/configure-overlaybd-p2p-helm
+  helm --kube-context=$CLUSTER_CONTEXT install --namespace <your-namespace> --create-namespace --wait overlaybd ./tools/configure-overlaybd-p2p-helm
 ```
 
 ## Deployment
@@ -53,7 +53,7 @@ CLUSTER_CONTEXT=<your-cluster-context> && \
 
 ```bash
 CLUSTER_CONTEXT=<your-cluster-context> && \
-  helm --kube-context=$CLUSTER_CONTEXT install --wait peerd ./build/package/peerd-helm \
+  helm --kube-context=$CLUSTER_CONTEXT install --namespace <your-namespace> --create-namespace --wait peerd ./build/package/peerd-helm \
     --set peerd.image.ref=ghcr.io/azure/acr/dev/peerd:stable
 ```
 

From f4d9f840a9340fd400669f0a19ee7c67fcb69e7b Mon Sep 17 00:00:00 2001
From: Vighneshwar Madas <vighnesh.madas@gmail.com>
Date: Wed, 14 May 2025 18:34:08 +0100
Subject: [PATCH 2/4] Update namespace changes in test scripts

---
 build/ci/scripts/azure.sh | 20 +++++++++++---------
 build/ci/scripts/kind.sh  | 17 +++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/build/ci/scripts/azure.sh b/build/ci/scripts/azure.sh
index 856d099..96c4c49 100755
--- a/build/ci/scripts/azure.sh
+++ b/build/ci/scripts/azure.sh
@@ -4,6 +4,7 @@ set -e
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
 
+HELM_RELEASE_NAMESPACE=peerd-ns
 PEERD_HELM_CHART="$SCRIPT_DIR/../../package/peerd-helm"
 SCANNER_APP_DEPLOY_TEMPLATE="$SCRIPT_DIR/../k8s/scanner.yml"
 PEERD_LLM_CI_DEPLOY_TEMPLATE=$SCRIPT_DIR/../k8s/llm.yml
@@ -104,6 +105,7 @@ peerd_helm_deploy() {
     if [ "$DRY_RUN" == "false" ]; then
         HELM_RELEASE_NAME=peerd && \
             helm install --wait $HELM_RELEASE_NAME $PEERD_HELM_CHART \
+                --namespace $HELM_RELEASE_NAMESPACE --create-namespace \
                 --set "peerd.image.ref=ghcr.io/azure/acr/dev/peerd:$peerd_image_tag" \
                 --set "peerd.configureMirrors=$configureMirrors" \
                 --set "peerd.hosts[0]=https://acrp2pci.azurecr.io" \
@@ -130,7 +132,7 @@ wait_for_pod_events() {
     local found=0
 
     # Get the list of pods.
-    pods=$(kubectl -n peerd-ns get pods -l $selector -o jsonpath='{.items[*].metadata.name}')
+    pods=$(kubectl -n $HELM_RELEASE_NAMESPACE get pods -l $selector -o jsonpath='{.items[*].metadata.name}')
     echo "pods: $pods"
     total=`echo "$pods" | tr -s " " "\012" | wc -l`
 
@@ -147,10 +149,10 @@ wait_for_pod_events() {
         for pod in $( echo "$pods" | tr -s " " "\012" ); do
             echo "checking pod '$pod' for event '$event'"
 
-            foundEvent=$(kubectl -n peerd-ns get events --field-selector involvedObject.kind=Pod,involvedObject.name=$pod -o json | jq -r ".items[] | select(.reason == \"$event\")")
+            foundEvent=$(kubectl -n $HELM_RELEASE_NAMESPACE get events --field-selector involvedObject.kind=Pod,involvedObject.name=$pod -o json | jq -r ".items[] | select(.reason == \"$event\")")
             [[ "$foundEvent" == "" ]] && echo "Event '$event' not found for pod '$pod'" || found=$((found+1))
 
-            errorEvent=$(kubectl -n peerd-ns get events --field-selector involvedObject.kind=Pod,involvedObject.name=$pod -o json | jq -r '.items[] | select(.reason == "P2PDisconnected" or .resosn == "P2PFailed")')
+            errorEvent=$(kubectl -n $HELM_RELEASE_NAMESPACE get events --field-selector involvedObject.kind=Pod,involvedObject.name=$pod -o json | jq -r '.items[] | select(.reason == "P2PDisconnected" or .reason == "P2PFailed")')
             [[ "$errorEvent" == "" ]] || (echo "Error event found for pod '$pod': $errorEvent" && exit 1)
         done
 
@@ -171,13 +173,13 @@ wait_for_pod_events() {
 }
 
 print_peerd_metrics() {
-    p=$(kubectl -n peerd-ns get pods -l app=peerd -o jsonpath='{.items[*].metadata.name}')
+    p=$(kubectl -n $HELM_RELEASE_NAMESPACE get pods -l app=peerd -o jsonpath='{.items[*].metadata.name}')
     echo "pods: $p"
 
     for pod in $( echo "$p" | tr -s " " "\012" ); do
         echo "checking pod '$pod' for metrics"
-        kubectl -n peerd-ns exec -i $pod -- bash -c "cat /var/log/peerdmetrics"
-        kubectl --context=$KIND_CLUSTER_CONTEXT -n peerd-ns exec -i $pod -- bash -c "curl http://localhost:5004/metrics/prometheus" | head -n 20 | echo " ..."
+        kubectl -n $HELM_RELEASE_NAMESPACE exec -i $pod -- bash -c "cat /var/log/peerdmetrics"
+        kubectl --context=$KIND_CLUSTER_CONTEXT -n $HELM_RELEASE_NAMESPACE exec -i $pod -- bash -c "curl http://localhost:5004/metrics/prometheus" | head -n 20 | echo " ..."
     done
 }
 
@@ -200,7 +202,7 @@ peerd_pod_watcher() {
 
     for ((i = 1; i <= 300; i++)); do
         # Get the list of pods with the label `app=peerd`
-        pods=$(kubectl -n peerd-ns get pods -l app=peerd -o jsonpath='{.items[*].metadata.name}')
+        pods=$(kubectl -n $HELM_RELEASE_NAMESPACE get pods -l app=peerd -o jsonpath='{.items[*].metadata.name}')
         if [ -z "$pods" ]; then
             echo "[Pod Watcher] No pods found with label 'app=peerd'. Retrying..."
             sleep 15
@@ -213,11 +215,11 @@ peerd_pod_watcher() {
         for pod in $pods; do
             # echo "[Pod Watcher] Checking pod '$pod' for event '$event'"
 
-            if kubectl -n peerd-ns get events --field-selector involvedObject.kind=Pod,involvedObject.name="$pod" -o json | \
+            if kubectl -n $HELM_RELEASE_NAMESPACE get events --field-selector involvedObject.kind=Pod,involvedObject.name="$pod" -o json | \
                 jq -e ".items[] | select(.reason == \"$event\")" > /dev/null; then
                 # echo "[Pod Watcher] Event '$event' found for pod '$pod'"
 
-                NODE_NAME=$(kubectl -n peerd-ns get pod "$pod" -o jsonpath='{.spec.nodeName}')
+                NODE_NAME=$(kubectl -n $HELM_RELEASE_NAMESPACE get pod "$pod" -o jsonpath='{.spec.nodeName}')
                 if [ -n "$NODE_NAME" ]; then
                     currentLabel=$(kubectl get node $NODE_NAME -o jsonpath='{.metadata.labels.peerd-status}')
                     if [ "$currentLabel" == "connected" ]; then
diff --git a/build/ci/scripts/kind.sh b/build/ci/scripts/kind.sh
index b6b7313..d1e35db 100755
--- a/build/ci/scripts/kind.sh
+++ b/build/ci/scripts/kind.sh
@@ -7,6 +7,7 @@ KIND_CLUSTER_CONTEXT="kind-$KIND_CLUSTER_NAME"
 CLUSTER_CONFIG_FILE="$SCRIPT_DIR/../k8s/kind-cluster.yml"
 HELM_CHART_DIR="$SCRIPT_DIR/../../package/peerd-helm"
 HELM_RELEASE_NAME="peerd"
+HELM_RELEASE_NAMESPACE="peerd-ns"
 export GIT_ROOT="$(git rev-parse --show-toplevel)"
 
 # Console colors and helpers
@@ -118,13 +119,13 @@ validate_params() {
 }
 
 print_p2p_metrics() {
-    p=$(kubectl --context=$KIND_CLUSTER_CONTEXT -n peerd-ns get pods -l app=peerd -o jsonpath='{.items[*].metadata.name}')
+    p=$(kubectl --context=$KIND_CLUSTER_CONTEXT -n $HELM_RELEASE_NAMESPACE get pods -l app=peerd -o jsonpath='{.items[*].metadata.name}')
     echo "pods: $p"
 
     for pod in $( echo "$p" | tr -s " " "\012" ); do
         echo "checking pod '$pod' for metrics"
-        kubectl --context=$KIND_CLUSTER_CONTEXT -n peerd-ns exec -i $pod -- bash -c "cat /var/log/peerdmetrics"
-        kubectl --context=$KIND_CLUSTER_CONTEXT -n peerd-ns exec -i $pod -- bash -c "curl http://localhost:5004/metrics/prometheus" | head -n 10
+        kubectl --context=$KIND_CLUSTER_CONTEXT -n $HELM_RELEASE_NAMESPACE exec -i $pod -- bash -c "cat /var/log/peerdmetrics"
+        kubectl --context=$KIND_CLUSTER_CONTEXT -n $HELM_RELEASE_NAMESPACE exec -i $pod -- bash -c "curl http://localhost:5004/metrics/prometheus" | head -n 10
     done
 }
 
@@ -163,7 +164,7 @@ wait_for_events() {
     local event=$2
     local minimumRequired=$3
 
-    local ns="peerd-ns"
+    local ns="$HELM_RELEASE_NAMESPACE"
     local found=0
 
     # # Get app pods
@@ -290,9 +291,9 @@ cmd__test__random() {
 
         echo "waiting for logs" && \
             sleep 10 && \
-            kubectl --context=$KIND_CLUSTER_CONTEXT -n peerd-ns logs -l app=random -f
-    
-        kubectl --context=$KIND_CLUSTER_CONTEXT -n peerd-ns delete ds/random
+            kubectl --context=$KIND_CLUSTER_CONTEXT -n $HELM_RELEASE_NAMESPACE logs -l app=random -f
+
+        kubectl --context=$KIND_CLUSTER_CONTEXT -n $HELM_RELEASE_NAMESPACE delete ds/random
 
         echo "checking p2p active pods" && sleep 2
         wait_for_events $KIND_CLUSTER_CONTEXT "P2PActive" 1
@@ -333,7 +334,7 @@ cmd__app__deploy() {
             helm --kube-context=$KIND_CLUSTER_CONTEXT uninstall $HELM_RELEASE_NAME
 
         echo "Helm installing release:" $HELM_RELEASE_NAME
-        helm --kube-context=$KIND_CLUSTER_CONTEXT install --wait $HELM_RELEASE_NAME $HELM_CHART_DIR \
+        helm --kube-context=$KIND_CLUSTER_CONTEXT install --namespace $HELM_RELEASE_NAMESPACE --create-namespace --wait $HELM_RELEASE_NAME $HELM_CHART_DIR \
             --set peerd.image.ref=$PEERD_CONTAINER_IMAGE_REF
 
         echo "waiting for pods to connect"

From 13248bdbad4979c33ff1a2af90d747100c610666 Mon Sep 17 00:00:00 2001
From: Vighneshwar Madas <vighnesh.madas@gmail.com>
Date: Wed, 25 Jun 2025 11:16:07 +0100
Subject: [PATCH 3/4] Reinstate peerd namespace manifest

---
 build/package/peerd-helm/templates/_helpers.tpl | 10 +++++++++-
 build/package/peerd-helm/templates/peerd-ns.yml |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 build/package/peerd-helm/templates/peerd-ns.yml

diff --git a/build/package/peerd-helm/templates/_helpers.tpl b/build/package/peerd-helm/templates/_helpers.tpl
index 5f6f2c1..33e9199 100644
--- a/build/package/peerd-helm/templates/_helpers.tpl
+++ b/build/package/peerd-helm/templates/_helpers.tpl
@@ -5,6 +5,14 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{- define "peerd.namespace" -}}
+{{- if .Release.Namespace }}
+{{- .Release.Namespace }}
+{{- else }}
+{{ include "peerd.name" . }}-ns
+{{- end }}
+{{- end }}
+
 {{- define "peerd.serviceAccountName" -}}
 {{ include "peerd.name" . }}-sa
 {{- end }}
@@ -53,4 +61,4 @@ Common selector labels
 app: {{ include "peerd.name" . }}
 app.kubernetes.io/name: {{ include "peerd.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/build/package/peerd-helm/templates/peerd-ns.yml b/build/package/peerd-helm/templates/peerd-ns.yml
new file mode 100644
index 0000000..f636acc
--- /dev/null
+++ b/build/package/peerd-helm/templates/peerd-ns.yml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ include "peerd.namespace" . }}
+  labels:
+    {{- include "peerd.labels" . | nindent 4 }}
\ No newline at end of file

From 683e252bf98347909ba566c0c4daa6fd3919dcf5 Mon Sep 17 00:00:00 2001
From: Vighneshwar Madas <vighnesh.madas@gmail.com>
Date: Wed, 2 Jul 2025 16:23:11 +0100
Subject: [PATCH 4/4] Revert back to peerd.namespace

---
 .../peerd-helm/templates/events-clusterrolebinding.yml        | 2 +-
 build/package/peerd-helm/templates/peerd-ds.yml               | 2 +-
 .../peerd-helm/templates/peerd-manager-role-binding.yml       | 4 ++--
 build/package/peerd-helm/templates/peerd-manager-role.yml     | 2 +-
 build/package/peerd-helm/templates/peerd-sa-secret.yml        | 2 +-
 build/package/peerd-helm/templates/peerd-sa.yml               | 2 +-
 build/package/peerd-helm/templates/peerd-svc.yml              | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/package/peerd-helm/templates/events-clusterrolebinding.yml b/build/package/peerd-helm/templates/events-clusterrolebinding.yml
index 9d16e2e..1567359 100644
--- a/build/package/peerd-helm/templates/events-clusterrolebinding.yml
+++ b/build/package/peerd-helm/templates/events-clusterrolebinding.yml
@@ -7,7 +7,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: {{ include "peerd.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
 roleRef:
   kind: ClusterRole
   name: node-reader-and-event-creator-clusterrole
diff --git a/build/package/peerd-helm/templates/peerd-ds.yml b/build/package/peerd-helm/templates/peerd-ds.yml
index db95b73..af39d88 100644
--- a/build/package/peerd-helm/templates/peerd-ds.yml
+++ b/build/package/peerd-helm/templates/peerd-ds.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: &name {{ include "peerd.name" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 {{- if .Values.peerd.metrics.prometheus.aksAutoDiscovery }}
diff --git a/build/package/peerd-helm/templates/peerd-manager-role-binding.yml b/build/package/peerd-helm/templates/peerd-manager-role-binding.yml
index 56ae75a..b2592ec 100644
--- a/build/package/peerd-helm/templates/peerd-manager-role-binding.yml
+++ b/build/package/peerd-helm/templates/peerd-manager-role-binding.yml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "peerd.name" . }}-manager-role-binding
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 roleRef:
@@ -12,4 +12,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "peerd.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "peerd.namespace" . }}
diff --git a/build/package/peerd-helm/templates/peerd-manager-role.yml b/build/package/peerd-helm/templates/peerd-manager-role.yml
index 9555a4b..90f4b92 100644
--- a/build/package/peerd-helm/templates/peerd-manager-role.yml
+++ b/build/package/peerd-helm/templates/peerd-manager-role.yml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "peerd.name" . }}-manager-role
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 rules:
diff --git a/build/package/peerd-helm/templates/peerd-sa-secret.yml b/build/package/peerd-helm/templates/peerd-sa-secret.yml
index 50b7ce4..67add0e 100644
--- a/build/package/peerd-helm/templates/peerd-sa-secret.yml
+++ b/build/package/peerd-helm/templates/peerd-sa-secret.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "peerd.serviceAccountName" . }}-secret
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
   annotations:
diff --git a/build/package/peerd-helm/templates/peerd-sa.yml b/build/package/peerd-helm/templates/peerd-sa.yml
index 7b147cc..273295e 100644
--- a/build/package/peerd-helm/templates/peerd-sa.yml
+++ b/build/package/peerd-helm/templates/peerd-sa.yml
@@ -2,6 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "peerd.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
diff --git a/build/package/peerd-helm/templates/peerd-svc.yml b/build/package/peerd-helm/templates/peerd-svc.yml
index f3ef36b..d8a062e 100644
--- a/build/package/peerd-helm/templates/peerd-svc.yml
+++ b/build/package/peerd-helm/templates/peerd-svc.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: &name {{ include "peerd.name" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "peerd.namespace" . }}
   labels:
     {{- include "peerd.labels" . | nindent 4 }}
 {{- if .Values.peerd.metrics.prometheus.aksAutoDiscovery }}