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

[REV]使用通过环境变量获取的tenant_id

Browse Source
This commit is contained in:
崔斌 2017-11-14 18:45:58 +08:00
parent f8bf8a7df5
commit a6721eaf49
4 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/node/server/server.go
View File

@ -95,7 +95,7 @@ func Run(c *option.Conf) error {
}
if err := db.CreateManager(dbconfig); err != nil {
logrus.Warnf("create db manager error, %v", err)
logrus.Warnf("Ignore this db error for node main functions, but discover services in this node will not work.")
logrus.Warnf("Ignore this db error for node main functions, but discover services in this node may be influenced.")
//return err
}
defer db.CloseManager()

4
pkg/node/api/controller/discoverController.go
View File

@ -46,7 +46,7 @@ func ServiceDiscover(w http.ResponseWriter, r *http.Request) {
//ListenerDiscover ListenerDiscover
func ListenerDiscover(w http.ResponseWriter, r *http.Request) {
tenantName := chi.URLParam(r, "tenant_name")
tenantName := chi.URLParam(r, "tenant_id")
serviceNodes := chi.URLParam(r, "service_nodes")
lds, err := discoverService.DiscoverListeners(tenantName, serviceNodes)
if err != nil {
@ -64,7 +64,7 @@ func ListenerDiscover(w http.ResponseWriter, r *http.Request) {
//ClusterDiscover ClusterDiscover
func ClusterDiscover(w http.ResponseWriter, r *http.Request) {
tenantName := chi.URLParam(r, "tenant_name")
tenantName := chi.URLParam(r, "tenant_id")
serviceNodes := chi.URLParam(r, "service_nodes")
cds, err := discoverService.DiscoverClusters(tenantName, serviceNodes)
if err != nil {

4
pkg/node/api/router/discoverRouter.go
View File

@ -39,7 +39,7 @@ func DisconverRoutes() chi.Router {
func ListenersRoutes() chi.Router {
r := chi.NewRouter()
r.Get("/ping", controller.Ping)
r.Get("/{tenant_name}/{service_nodes}", controller.ListenerDiscover)
r.Get("/{tenant_id}/{service_nodes}", controller.ListenerDiscover)
return r
}
@ -48,7 +48,7 @@ func ListenersRoutes() chi.Router {
func ClustersRoutes() chi.Router {
r := chi.NewRouter()
r.Get("/ping", controller.Ping)
r.Get("/{tenant_name}/{service_nodes}", controller.ClusterDiscover)
r.Get("/{tenant_id}/{service_nodes}", controller.ClusterDiscover)
return r
}

38
pkg/node/core/service/discover_server.go
View File

@ -49,19 +49,11 @@ func (d *DiscoverAction) DiscoverService(serviceInfo string) (*node_model.SDS, *
if len(mm) < 3 {
return nil, util.CreateAPIHandleError(400, fmt.Errorf("service_name is not in good format"))
}
tenantName := mm[0]
namespace := mm[0]
serviceAlias := mm[1]
dPort := mm[2]
//deployVersion := mm[3]
namespace, err := d.ToolsGetTenantUUID(tenantName)
if err != nil {
return nil, util.CreateAPIHandleErrorFromDBError("get tenant uuid ", err)
}
// serviceID, err := d.ToolsGetServiceID(uuid, serviceAlias)
// if err != nil {
// return nil, util.CreateAPIHandleErrorFromDBError("get service id ", err)
// }
labelname := fmt.Sprintf("name=%sService", serviceAlias)
endpoint, err := k8s.K8S.Core().Endpoints(namespace).List(metav1.ListOptions{LabelSelector: labelname})
if err != nil {
@ -100,15 +92,11 @@ func (d *DiscoverAction) DiscoverService(serviceInfo string) (*node_model.SDS, *
}
//DiscoverListeners DiscoverListeners
func (d *DiscoverAction) DiscoverListeners(tenantName, serviceCluster string) (*node_model.LDS, *util.APIHandleError) {
func (d *DiscoverAction) DiscoverListeners(namespace, serviceCluster string) (*node_model.LDS, *util.APIHandleError) {
mm := strings.Split(serviceCluster, "_")
if len(mm) == 0 {
return nil, util.CreateAPIHandleError(400, fmt.Errorf("service_name is not in good format"))
}
namespace, err := d.ToolsGetTenantUUID(tenantName)
if err != nil {
return nil, util.CreateAPIHandleErrorFromDBError("get tenant uuid ", err)
}
var ldsL []*node_model.PieceLDS
for _, serviceAlias := range mm {
labelname := fmt.Sprintf("name=%sService", serviceAlias)
@ -143,13 +131,13 @@ func (d *DiscoverAction) DiscoverListeners(tenantName, serviceCluster string) (*
switch port.Protocol {
case "TCP":
ptr := &node_model.PieceTCPRoute{
Cluster: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
Cluster: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
}
lrs := &node_model.LDSTCPRoutes{
Routes: []*node_model.PieceTCPRoute{ptr},
}
lcg := &node_model.LDSTCPConfig{
StatPrefix: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
StatPrefix: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
RouteConfig: lrs,
}
lfs := &node_model.LDSFilters{
@ -157,7 +145,7 @@ func (d *DiscoverAction) DiscoverListeners(tenantName, serviceCluster string) (*
Config: lcg,
}
plds := &node_model.PieceLDS{
Name: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
Name: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
Address: fmt.Sprintf("tcp://0.0.0.0:%v", port.Port),
Filters: []*node_model.LDSFilters{lfs},
}
@ -171,14 +159,14 @@ func (d *DiscoverAction) DiscoverListeners(tenantName, serviceCluster string) (*
prs := &node_model.PieceHTTPRoutes{
TimeoutMS: 0,
Prefix: "/",
Cluster: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
Cluster: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
}
domain, ok := service.Labels["domain"]
if !ok {
domain = "*"
}
pvh := &node_model.PieceHTTPVirtualHost{
Name: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
Name: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
Domains: []string{domain},
Routes: []*node_model.PieceHTTPRoutes{prs},
}
@ -196,7 +184,7 @@ func (d *DiscoverAction) DiscoverListeners(tenantName, serviceCluster string) (*
Config: lhc,
}
plds := &node_model.PieceLDS{
Name: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
Name: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
Address: fmt.Sprintf("tcp://0.0.0.0:%v", port.TargetPort),
Filters: []*node_model.LDSFilters{lfs},
}
@ -213,15 +201,11 @@ func (d *DiscoverAction) DiscoverListeners(tenantName, serviceCluster string) (*
}
//DiscoverClusters DiscoverClusters
func (d *DiscoverAction) DiscoverClusters(tenantName, serviceCluster string) (*node_model.CDS, *util.APIHandleError) {
func (d *DiscoverAction) DiscoverClusters(namespace, serviceCluster string) (*node_model.CDS, *util.APIHandleError) {
mm := strings.Split(serviceCluster, "_")
if len(mm) == 0 {
return nil, util.CreateAPIHandleError(400, fmt.Errorf("service_name is not in good format"))
}
namespace, err := d.ToolsGetTenantUUID(tenantName)
if err != nil {
return nil, util.CreateAPIHandleErrorFromDBError("get tenant uuid ", err)
}
var cdsL []*node_model.PieceCDS
for _, serviceAlias := range mm {
labelname := fmt.Sprintf("name=%sService", serviceAlias)
@ -232,11 +216,11 @@ func (d *DiscoverAction) DiscoverClusters(tenantName, serviceCluster string) (*n
for _, service := range services.Items {
for _, port := range service.Spec.Ports {
pcds := &node_model.PieceCDS{
Name: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
Name: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
Type: "sds",
ConnectTimeoutMS: 250,
LBType: "round_robin",
ServiceName: fmt.Sprintf("%s_%s_%v", tenantName, serviceAlias, port.Port),
ServiceName: fmt.Sprintf("%s_%s_%v", namespace, serviceAlias, port.Port),
}
cdsL = append(cdsL, pcds)
continue