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 {