From fd65f371d6b6a05ae99d35cef53e20d652bbd7aa Mon Sep 17 00:00:00 2001
From: Jian Zhu <jiazhu@redhat.com>
Date: Wed, 15 May 2024 10:01:56 +0800
Subject: [PATCH] Only decorate namespace for namespaced resources (#462)

Signed-off-by: zhujian <jiazhu@redhat.com>
---
 pkg/addon/templateagent/decorator.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/addon/templateagent/decorator.go b/pkg/addon/templateagent/decorator.go
index 1ce5c73a2..781b503a6 100644
--- a/pkg/addon/templateagent/decorator.go
+++ b/pkg/addon/templateagent/decorator.go
@@ -46,9 +46,10 @@ func (d *namespaceDecorator) decorate(obj *unstructured.Unstructured) (*unstruct
 		return obj, nil
 	}
 
-	// set namespace for all manifests, if the manifest is cluster scoped, namespace will be ignored when
-	// being applied.
-	obj.SetNamespace(d.installNamespace)
+	// If obj has no namespace set, we do not mutate namespace assuming it is cluster scoped.
+	if len(obj.GetNamespace()) > 0 {
+		obj.SetNamespace(d.installNamespace)
+	}
 
 	paths, ok := d.paths[obj.GetKind()]
 	if !ok {