quick-start related optimization (#1242)

* optimize: optimize tmc migrations * optimize for quick-start service lookup * optimize: remove test code * optimize: unnecessary to check the cluster type before replace tmc addr to msp addr * optimize the quick-start/docker-compose.yml * optimize the quick-start/docker-compose.yml * update quick-start image
erda-project · Jul 31, 2021 · af96ef6 · af96ef6
1 parent 9d29de5
commit af96ef6
Show file tree

Hide file tree

Showing 6 changed files with 427 additions and 190 deletions.
diff --git a/.erda/migrations/msp/20200528-tmc-base.sql b/.erda/migrations/msp/20200528-tmc-base.sql
diff --git a/modules/core/monitor/log/schema/manager.go b/modules/core/monitor/log/schema/manager.go
@@ -35,7 +35,7 @@ const (
 	gcGraceSeconds   = 86400
 )
 
-var bdl = bundle.New(bundle.WithCoreServices())
+var bdl = bundle.New(bundle.WithCoreServices(), bundle.WithDOP())
 
 type LogSchema interface {
 	Name() string

diff --git a/modules/orchestrator/initialize.go b/modules/orchestrator/initialize.go
@@ -102,6 +102,8 @@ func initEndpoints(db *dbclient.DBClient) (*endpoints.Endpoints, error) {
 		bundle.WithPipeline(),
 		bundle.WithGittar(),
 		bundle.WithMSP(),
+		bundle.WithDOP(),
+		bundle.WithClusterManager(),
 	}
 	bdl := bundle.New(bundleOpts...)
 

diff --git a/modules/orchestrator/services/addon/addon_handler.go b/modules/orchestrator/services/addon/addon_handler.go
@@ -1155,16 +1155,8 @@ func (a *Addon) getRandomId() string {
 
 // CreateAddonProvider 请求addon provider，获取新的addon实例
 func (a *Addon) CreateAddonProvider(req *apistructs.AddonProviderRequest, addonName, providerDomain, userId string) (int, *apistructs.AddonProviderResponse, error) {
-	clusterInfo, err := a.bdl.QueryClusterInfo(conf.MainClusterName())
-	if err != nil {
-		logrus.Errorf("拉取cluster接口失败")
-		return 0, nil, err
-	}
-	// 若为 kubernetes 集群
-	if clusterInfo[apistructs.DICE_CLUSTER_TYPE] == apistructs.AddonMainClusterDefaultName {
-		if strings.Contains(providerDomain, "tmc") {
-			providerDomain = discover.MSP()
-		}
+	if strings.Contains(providerDomain, "tmc.") {
+		providerDomain = discover.MSP()
 	}
 	req.Callback = "http://" + discover.Orchestrator()
 	logrus.Infof("start creating addon provider, url: %v, body: %+v", providerDomain+"/"+addonName+apistructs.AddonGetResourcePath, req)
@@ -1197,19 +1189,11 @@ func (a *Addon) CreateAddonProvider(req *apistructs.AddonProviderRequest, addonN
 func (a *Addon) DeleteAddonProvider(req *apistructs.AddonProviderRequest, uuid, addonName, providerDomain string) (*apistructs.AddonProviderDeleteResponse, error) {
 	logrus.Infof("deleting addon provider request: %+v", req)
 
-	clusterInfo, err := a.bdl.QueryClusterInfo(conf.MainClusterName())
-	if err != nil {
-		logrus.Errorf("拉取cluster接口失败")
-		return nil, err
-	}
-	if clusterInfo[apistructs.DICE_CLUSTER_TYPE] == apistructs.AddonMainClusterDefaultName {
-		if strings.Contains(providerDomain, "pandora") {
-			providerDomain = strings.Replace(providerDomain, "pandora.marathon.l4lb.thisdcos.directory:8050", "pandora.default.svc.cluster.local:8050", -1)
-		}
-		if strings.Contains(providerDomain, "tmc") {
-			providerDomain = discover.MSP()
-			//providerDomain = strings.Replace(providerDomain, "tmc.marathon.l4lb.thisdcos.directory:8050", "tmc.default.svc.cluster.local:8050", -1)
-		}
+	if strings.Contains(providerDomain, "pandora.") {
+		providerDomain = strings.Replace(providerDomain, "pandora.marathon.l4lb.thisdcos.directory:8050", "pandora.default.svc.cluster.local:8050", -1)
+	} else if strings.Contains(providerDomain, "tmc.") {
+		providerDomain = discover.MSP()
+		//providerDomain = strings.Replace(providerDomain, "tmc.marathon.l4lb.thisdcos.directory:8050", "tmc.default.svc.cluster.local:8050", -1)
 	}
 	logrus.Infof("start delete addon provider, url: %v", providerDomain+"/"+addonName+apistructs.AddonGetResourcePath+"/"+uuid)