Update dubboctl and operator code logic (#856)

Author: mfordjody

dubbod/discovery/docker/dockerfile.planet dubbod/discovery/docker/dockerfile.dubbodubbod/discovery/docker/dockerfile.planet renamed to dubbod/discovery/docker/dockerfile.dubbo

@@ -22,12 +22,9 @@ spec:
   components:
     base:
       enabled: true
-    discovery:
-      dubbo:
-        enabled: true
+    dubbo:
+      enabled: true
   values:
     global: {}
-    base: {}
-
 
 

…discovery/docker/dockerfile.proxyadapter dubbod/discovery/docker/dockerfile.proxydubbod/discovery/docker/dockerfile.proxyadapter renamed to dubbod/discovery/docker/dockerfile.proxy dubbod/discovery/docker/dockerfile.proxyadapter renamed to dubbod/discovery/docker/dockerfile.proxy

@@ -19,6 +19,5 @@ spec:
   components:
     base:
       enabled: false
-    discovery:
-      dubbo:
-        enabled: false
+    dubbo:
+      enabled: false

manifests/profiles/default.yaml

@@ -53,11 +53,6 @@ type DubboComponentSpec struct {
 	// Used for Dubbo resources.
 	Base *BaseComponentSpec `json:"base,omitempty"`
 	// Using Dubbo as the control plane.
-	Discovery *DiscoverySpec `json:"discovery,omitempty"`
-}
-
-type DiscoverySpec struct {
-	// Dubbo component
 	Dubbo *DiscoveryComponentSpec `json:"dubbo,omitempty"`
 }
 

manifests/profiles/demo.yaml

@@ -53,19 +53,18 @@ var AllComponents = []Component{
 		UserFacingName:     BaseComponentName,
 		SpecName:           "base",
 		ResourceType:       "Base",
-		Default:            true,
 		HelmSubDir:         "base",
+		Default:            true,
 		HelmValuesTreeRoot: "global",
 	},
 	{
-		UserFacingName:     DubboDiscoveryComponentName,
-		SpecName:           "dubbo",
-		ResourceType:       "Deployment",
-		ResourceName:       "dubbod",
-		ContainerName:      "dubbo-discovery",
-		Default:            true,
-		HelmSubDir:         "dubbo-control/dubbo-discovery",
-		HelmValuesTreeRoot: "global",
+		UserFacingName: DubboDiscoveryComponentName,
+		SpecName:       "dubbo",
+		ResourceType:   "Deployment",
+		ResourceName:   "dubbo",
+		ContainerName:  "dubbo-discovery",
+		Default:        true,
+		HelmSubDir:     "dubbo-control/dubbo-discovery",
 	},
 }
 
@@ -76,8 +75,8 @@ var (
 	}
 
 	Icons = map[Name]string{
-		BaseComponentName:           "🔮",
-		DubboDiscoveryComponentName: "🪐",
+		BaseComponentName:           "⚡️",
+		DubboDiscoveryComponentName: "⚡️",
 	}
 )