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

[REV]Add port_protocol label in service building

Browse Source
This commit is contained in:
pujielan 2017-12-15 14:52:42 +08:00
parent 8c7aed3d3f
commit 817ddc65c6
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,20 @@ func (d *DiscoverAction) DiscoverService(serviceInfo string) (*node_model.SDS, *
return nil, util.CreateAPIHandleError(500, err)
}
if len(endpoints.Items) == 0 {
return nil, util.CreateAPIHandleError(400, fmt.Errorf("have no endpoints"))
if destServiceAlias == serviceAlias {
labelname := fmt.Sprintf("name=%sServiceOUT", destServiceAlias)
var err error
endpoints, err = k8s.K8S.Core().Endpoints(namespace).List(metav1.ListOptions{LabelSelector: labelname})
if err != nil {
return nil, util.CreateAPIHandleError(500, err)
}
if len(endpoints.Items) == 0 {
logrus.Debugf("outer endpoints items length is 0, continue")
return nil, util.CreateAPIHandleError(400, fmt.Errorf("outer have no endpoints"))
}
} else {
return nil, util.CreateAPIHandleError(400, fmt.Errorf("inner have no endpoints"))
}
}
var sdsL []*node_model.PieceSDS
for key, item := range endpoints.Items {
@ -128,6 +141,7 @@ func (d *DiscoverAction) DiscoverListeners(
return nil, util.CreateAPIHandleError(500, fmt.Errorf(
"get env %s error: %v", namespace+serviceAlias+pluginID, err))
}
logrus.Debugf("process go on")
//TODO: console控制尽量不把小于1000的端口给用户使用
var vhL []*node_model.PieceHTTPVirtualHost
var ldsL []*node_model.PieceLDS
@ -142,16 +156,35 @@ func (d *DiscoverAction) DiscoverListeners(
return nil, util.CreateAPIHandleError(500, err)
}
if len(endpoint.Items) == 0 {
if destServiceAlias == serviceAlias {
labelname := fmt.Sprintf("name=%sServiceOUT", destServiceAlias)
var err error
endpoint, err = k8s.K8S.Core().Endpoints(namespace).List(metav1.ListOptions{LabelSelector: labelname})
if err != nil {
return nil, util.CreateAPIHandleError(500, err)
}
if len(endpoint.Items) == 0 {
logrus.Debugf("outer endpoints items length is 0, continue")
continue
}
} else {
logrus.Debugf("inner endpoints items length is 0, continue")
continue
}
}
for _, service := range services.Items {
//TODO: HTTP inner的protocol添加资源时需要label
inner, ok := service.Labels["service_type"]
if !ok || inner != "inner" {
if destServiceAlias != serviceAlias {
continue
}
}
port := service.Spec.Ports[0].Port
portProtocol, ok := service.Labels["port_protocol"]
if !ok {
logrus.Debugf("have no port Protocol")
}
if ok {
logrus.Debugf("port protocol is %s", portProtocol)
switch portProtocol {
@ -260,6 +293,7 @@ func (d *DiscoverAction) DiscoverListeners(
}
}
if len(vhL) != 0 {
logrus.Debugf("vhl len is not 0")
httpPort := 80
hsf := &node_model.HTTPSingleFileter{
Type: "decoder",

1
pkg/worker/appm/service.go
View File

@ -213,6 +213,7 @@ func (k *K8sServiceBuild) createOuterService(port *model.TenantServicesPort) *v1
"services_version": k.service.ServiceVersion,
"domain": k.service.Autodomain(k.tenant.Name, port.ContainerPort),
"protocol": port.Protocol,
"port_protocol": port.Protocol,
"ca": "",
"key": "",
"event_id": k.eventID,