Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

quick-start related optimization #1242

Merged
merged 7 commits into from
Jul 31, 2021
Merged

quick-start related optimization #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb2530a
optimize: optimize tmc migrations
snakorse Jul 30, 2021
2c2fc63
optimize for quick-start service lookup
snakorse Jul 30, 2021
b43ac46
optimize: remove test code
snakorse Jul 30, 2021
9953048
optimize: unnecessary to check the cluster type before replace tmc ad…
snakorse Jul 30, 2021
e61732c
optimize the quick-start/docker-compose.yml
snakorse Jul 30, 2021
10eca23
optimize the quick-start/docker-compose.yml
snakorse Jul 30, 2021
2ce0213
update quick-start image
snakorse Jul 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .erda/migrations/msp/20200528-tmc-base.sql
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/core/monitor/log/schema/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions modules/orchestrator/initialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...)

Expand Down
30 changes: 7 additions & 23 deletions modules/orchestrator/services/addon/addon_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
Loading