From fea2a0148e61b09c89ac83033c8e47f6a5dacafa Mon Sep 17 00:00:00 2001
From: Rajat Vig <rvig@etsy.com>
Date: Sat, 6 May 2023 19:43:46 +0100
Subject: [PATCH] Use release namespace for configmaps in setup helm chart

Signed-off-by: Rajat Vig <rvig@etsy.com>
---
 k8s/helm-charts/seldon-core-v2-setup/templates/agent.yaml      | 3 ++-
 k8s/helm-charts/seldon-core-v2-setup/templates/kafka.yaml      | 1 +
 .../seldon-core-v2-setup/templates/rclone-gs-public.yaml       | 1 +
 k8s/helm-charts/seldon-core-v2-setup/templates/tracing.yaml    | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/agent.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/agent.yaml
index 9a4acb5d07..44d12c3053 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/templates/agent.yaml
+++ b/k8s/helm-charts/seldon-core-v2-setup/templates/agent.yaml
@@ -2,7 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: seldon-agent
+  namespace: '{{ .Release.Namespace }}'
 data:
   agent.yaml: |-
-    rclone: 
+    rclone:
       config_secrets: ["seldon-rclone-gs-public"]
diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/kafka.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/kafka.yaml
index 46838bb429..efa0ba2060 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/templates/kafka.yaml
+++ b/k8s/helm-charts/seldon-core-v2-setup/templates/kafka.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: seldon-kafka
+  namespace: '{{ .Release.Namespace }}'
 data:
   kafka.json: |-
    {
diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/rclone-gs-public.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/rclone-gs-public.yaml
index fc3c496538..ab8159e162 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/templates/rclone-gs-public.yaml
+++ b/k8s/helm-charts/seldon-core-v2-setup/templates/rclone-gs-public.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: seldon-rclone-gs-public
+  namespace: '{{ .Release.Namespace }}'
 type: Opaque
 stringData:
   gs: |
diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/tracing.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/tracing.yaml
index 441441d92b..0acf2f178f 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/templates/tracing.yaml
+++ b/k8s/helm-charts/seldon-core-v2-setup/templates/tracing.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: seldon-tracing
+  namespace: '{{ .Release.Namespace }}'
 data:
   tracing.json: |-
    {