test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 03:37:46 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release-3.4.1' of https://github.com/goodrain/rainbond into release-3.4.1

Browse Source
This commit is contained in:
Bay 2017-12-29 14:24:37 +08:00
commit 87ca1b0397
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/controller/resources.go
View File

@ -1297,8 +1297,9 @@ func (t *TenantStruct) deletePortController(w http.ResponseWriter, r *http.Reque
return return
} }
var port = &api_model.TenantServicesPort{ var port = &api_model.TenantServicesPort{
TenantID: tenantID, TenantID: tenantID,
ServiceID: serviceID, ServiceID: serviceID,
ContainerPort: oldPort,
} }
var ports api_model.ServicePorts var ports api_model.ServicePorts
ports.Port = append(ports.Port, port) ports.Port = append(ports.Port, port)

2
pkg/entrance/source/config/config.go
View File

@ -80,7 +80,7 @@ type PodInfo struct {
const ( const (
VSPoolExpString string = "(.*)[@|_](.*)_([0-9]*)\\.[Pool|VS]" VSPoolExpString string = "(.*)[@|_](.*)_([0-9]*)\\.[Pool|VS]"
NodeExpString string = "(.*)_([0-9]*)\\.Node" NodeExpString string = "(.*)_([0-9]*)\\.Node"
DomainAPIURI string = "http://127.0.0.1:%s/tenants/%s/services/%s/domains" DomainAPIURI string = "http://127.0.0.1:%s/v2/tenants/%s/services/%s/domains"
) )
func (s *SourceBranch) RePoolName() string { func (s *SourceBranch) RePoolName() string {