[FIX] fix the bug that inconsistent name of envoy listener

cmd/node/server/server.go

@@ -79,6 +79,7 @@ func Run(c *option.Conf) error {
 	sharedInformers.Core().V1().Services().Informer()
 	sharedInformers.Core().V1().Endpoints().Informer()
 	sharedInformers.Start(stop)
+	defer close(stop)
 
 	s, err := nodeserver.NewNodeServer(c) //todo 配置文件 done
 	if err != nil {

node/core/envoy/v1/resource.go

@@ -823,7 +823,7 @@ func CreateHTTPCommonListener(name string, vh ...*VirtualHost) *Listener {
 //CreateTCPCommonListener create tcp simple common listener
 //listen the specified port
 //associate the specified cluster.
-func CreateTCPCommonListener(clusterName string, address string) *Listener {
+func CreateTCPCommonListener(listenerName, clusterName string, address string) *Listener {
 	ptr := &TCPRoute{
 		Cluster: clusterName,
 	}
@@ -831,7 +831,7 @@ func CreateTCPCommonListener(clusterName string, address string) *Listener {
 		Routes: []*TCPRoute{ptr},
 	}
 	lcg := &TCPProxyFilterConfig{
-		StatPrefix:  clusterName,
+		StatPrefix:  listenerName,
 		RouteConfig: lrs,
 	}
 	lfs := &NetworkFilter{
@@ -839,7 +839,7 @@ func CreateTCPCommonListener(clusterName string, address string) *Listener {
 		Config: lcg,
 	}
 	plds := &Listener{
-		Name:       clusterName,
+		Name:       listenerName,
 		Address:    address,
 		Filters:    []*NetworkFilter{lfs},
 		BindToPort: true,

node/core/k8s/k8s_test.go

@@ -43,18 +43,28 @@ func TestGetPodsByNodeName(t *testing.T) {
 func TestSharedInformerFactory(t *testing.T) {
 	sharedInformers := informers.NewSharedInformerFactory(K8S, time.Hour*10)
 	sharedInformers.Core().V1().Nodes().Informer()
+	sharedInformers.Core().V1().Services().Informer()
 	stop := make(chan struct{})
 	sharedInformers.Start(stop)
+	time.Sleep(time.Second * 30)
 	selector, err := labels.Parse("")
 	if err != nil {
 		t.Fatal(err)
 	}
-	for i := 0; i < 10; i++ {
+	for i := 0; i < 2; i++ {
 		nodes, err := sharedInformers.Core().V1().Nodes().Lister().List(selector)
 		if err != nil {
 			t.Fatal(err)
 		}
 		t.Log(nodes)
+	}
+	for i := 0; i < 2; i++ {
+		selector, _ := labels.Parse("name=gr87b487Service")
+		nodes, err := sharedInformers.Core().V1().Services().Lister().Services("824b2e9dcc4d461a852ddea20369d377").List(selector)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(nodes)
 		time.Sleep(time.Second * 5)
 	}
 

node/core/service/discover_server.go

@@ -322,25 +322,19 @@ func (d *DiscoverAction) upstreamListener(serviceAlias, namespace string, depend
 				continue
 			}
 			port := service.Spec.Ports[0].Port
+			clusterName := fmt.Sprintf("%s_%s_%s_%d", namespace, serviceAlias, destServiceAlias, port)
 			// Unique by listen port
-			if index, ok := portMap[port]; !ok {
+			if _, ok := portMap[port]; !ok {
-				clusterName := fmt.Sprintf("%s_%s_%s_%d", namespace, serviceAlias, destServiceAlias, port)
+				listenerName := fmt.Sprintf("%s_%s_%d", namespace, serviceAlias, port)
-				plds := envoyv1.CreateTCPCommonListener(clusterName, fmt.Sprintf("tcp://127.0.0.1:%d", port))
+				plds := envoyv1.CreateTCPCommonListener(listenerName, clusterName, fmt.Sprintf("tcp://127.0.0.1:%d", port))
 				ldsL = append(ldsL, plds)
 				portMap[port] = len(ldsL) - 1
-			} else if index != -1 {
-				clusterName := fmt.Sprintf("%s_%s_%d", namespace, serviceAlias, port)
-				plds := envoyv1.CreateTCPCommonListener(clusterName, fmt.Sprintf("tcp://127.0.0.1:%d", port))
-				ldsL[index] = plds
-				//only create one cluster for same port
-				portMap[port] = -1
 			}
 			portProtocol, ok := service.Labels["port_protocol"]
 			if !ok {
 				portProtocol = destService.Protocol
 			}
 			if portProtocol != "" {
-				clusterName := fmt.Sprintf("%s_%s_%s_%d", namespace, serviceAlias, destServiceAlias, port)
 				//TODO: support more protocol
 				switch portProtocol {
 				case "http", "https":
@@ -393,7 +387,7 @@ func (d *DiscoverAction) downstreamListener(serviceAlias, namespace string, port
 		port := int32(p.Port)
 		clusterName := fmt.Sprintf("%s_%s_%d", namespace, serviceAlias, port)
 		if _, ok := portMap[port]; !ok {
-			plds := envoyv1.CreateTCPCommonListener(clusterName, fmt.Sprintf("tcp://0.0.0.0:%d", p.ListenPort))
+			plds := envoyv1.CreateTCPCommonListener(clusterName, clusterName, fmt.Sprintf("tcp://0.0.0.0:%d", p.ListenPort))
 			ldsL = append(ldsL, plds)
 			portMap[port] = 1
 		}