From 41f384e36bb197f167f44695a1664c51527f61dc Mon Sep 17 00:00:00 2001
From: Zheng Xi Zhou <zzxwill@gmail.com>
Date: Thu, 25 Nov 2021 21:01:56 +0800
Subject: [PATCH] Fix: addon name should not add prefix `resources` (#2808)

* Fix: addon name should not add prefix `resources`

- Adding prefix `resources will hit issues as:
'unable to parse requirement: invalid label value:
"resources-prometheus-server-register-grafana-datasource-5576f7f6b4":
      at key: "controller.oam.dev/component": must be no more than 63 characters'
- This won't avoid the name confliction with other components

* address comments
---
 pkg/addon/addon.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/addon/addon.go b/pkg/addon/addon.go
index 7f32c5960..7b77d77b4 100644
--- a/pkg/addon/addon.go
+++ b/pkg/addon/addon.go
@@ -568,7 +568,7 @@ func renderNamespace(namespace string) *unstructured.Unstructured {
 func renderRawComponent(elem types.AddonElementFile) (*common2.ApplicationComponent, error) {
 	baseRawComponent := common2.ApplicationComponent{
 		Type: "raw",
-		Name: strings.Join(append(elem.Path, elem.Name), "-"),
+		Name: elem.Name,
 	}
 	obj, err := renderObject(elem)
 	if err != nil {
@@ -606,7 +606,7 @@ func renderCUETemplate(elem types.AddonElementFile, parameters string, args map[
 		return nil, err
 	}
 	comp := common2.ApplicationComponent{
-		Name: strings.Join(append(elem.Path, elem.Name), "-"),
+		Name: elem.Name,
 	}
 	err = yaml.Unmarshal(b, &comp)
 	if err != nil {