[operator] add admin charts logic

manifests/profiles/default.yaml

@@ -6,6 +6,11 @@ spec:
   components:
     base:
       enabled: true
+    admin:
+      enabled: true
   values:
-    global:
-      dubboNamespace: dubbo-system
+    base:
+      global:
+        dubboNamespace: dubbo-system
+    admin:
+      global: {}

operator/pkg/component/component.go

@@ -9,7 +9,8 @@ import (
 type Name string
 
 const (
-	BaseComponentName Name = "Base"
+	BaseComponentName  Name = "Base"
+	AdminComponentName Name = "Admin"
 )
 
 type Component struct {
@@ -18,6 +19,7 @@ type Component struct {
 	Default        bool
 	HelmSubDir     string
 	HelmTreeRoot   string
+	ResourceName   string
 	FlattenValues  bool
 }
 
@@ -27,16 +29,27 @@ var AllComponents = []Component{
 		SpecName:       "base",
 		Default:        true,
 		HelmSubDir:     "base",
-		HelmTreeRoot:   "global",
+		HelmTreeRoot:   "base.global",
+	},
+	{
+		UserFacingName: AdminComponentName,
+		SpecName:       "admin",
+		Default:        true,
+		ResourceName:   "admin",
+		HelmSubDir:     "admin",
+		HelmTreeRoot:   "admin.global",
 	},
 }
 
 var (
 	userFacingCompNames = map[Name]string{
-		BaseComponentName: "Dubbo Core",
+		BaseComponentName:  "Dubbo Core",
+		AdminComponentName: "Dubbo Dashboard or Control Plane",
 	}
+
 	Icons = map[Name]string{
-		BaseComponentName: "🛸",
+		BaseComponentName:  "🛸",
+		AdminComponentName: "🛰 ✗📡",
 	}
 )
 

operator/pkg/install/installer.go

@@ -202,6 +202,9 @@ func (i Installer) prune(manifests []manifest.ManifestSet) error {
 
 var componentDependencies = map[component.Name][]component.Name{
 	component.BaseComponentName: {},
+	component.AdminComponentName: {
+		component.BaseComponentName,
+	},
 }
 
 func dependenciesChs() map[component.Name]chan struct{} {

operator/pkg/render/manifest.go

@@ -111,7 +111,7 @@ func readBuiltinProfile(path, profile string) (values.Map, error) {
 	return values.MapFromYAML(pb)
 }
 
-func GenerateManifest(files []string, setFlags []string, logger clog.Logger, client kube.Client) ([]manifest.ManifestSet, values.Map, error) {
+func GenerateManifest(files []string, setFlags []string, logger clog.Logger, _ kube.Client) ([]manifest.ManifestSet, values.Map, error) {
 	merged, err := MergeInputs(files, setFlags)
 	if err != nil {
 		return nil, nil, fmt.Errorf("merge inputs: %v %v", err)

operator/pkg/util/progress/progress.go

@@ -5,6 +5,8 @@ import (
 	"github.com/apache/dubbo-kubernetes/operator/pkg/component"
 	"github.com/cheggaaa/pb/v3"
 	"io"
+	"sort"
+	"strings"
 	"sync"
 )
 
@@ -34,6 +36,30 @@ func NewInfo() *Info {
 	}
 }
 
+func (i *Info) createStatus(maxWidth int) string {
+	comps := make([]string, 0, len(i.components))
+	wait := make([]string, 0, len(i.components))
+	for c, l := range i.components {
+		comps = append(comps, component.UserFacingCompName(component.Name(c)))
+		wait = append(wait, l.waitingResources()...)
+	}
+	sort.Strings(comps)
+	sort.Strings(wait)
+	msg := fmt.Sprintf(`Processing resources for %s.`, strings.Join(comps, ", "))
+	if len(wait) > 0 {
+		msg += fmt.Sprintf(` Waiting for %s`, strings.Join(wait, ", "))
+	}
+	prefix := inProgress
+	if !i.bar.GetBool(pb.Terminal) {
+		prefix = `{{ yellow "-" }} `
+	}
+	maxWidth -= 2
+	if maxWidth > 0 && len(msg) > maxWidth {
+		return prefix + msg[:maxWidth-3] + "..."
+	}
+	return prefix + msg
+}
+
 func (i *Info) NewComponent(comp string) *ManifestInfo {
 	mi := &ManifestInfo{
 		report: i.reportProgress(comp),
@@ -54,7 +80,7 @@ func (i *Info) reportProgress(componentName string) func() {
 		finished := comp.finished
 		compErr := comp.err
 		comp.mu.Unlock()
-		successIcon := "🎉"
+		successIcon := "✅"
 		if icon, found := component.Icons[compName]; found {
 			successIcon = icon
 		}
@@ -68,6 +94,7 @@ func (i *Info) reportProgress(componentName string) func() {
 			i.bar = createBar()
 			return
 		}
+		i.SetMessage(i.createStatus(i.bar.Width()), false)
 	}
 }
 
@@ -146,3 +173,9 @@ func (mi *ManifestInfo) ReportError(err string) {
 	mi.mu.Unlock()
 	mi.report()
 }
+
+func (p *ManifestInfo) waitingResources() []string {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return p.waiting
+}