Fix service entry merge

istio · Apr 26, 2024 · d17ed67 · d17ed67
1 parent 676ba0e
commit d17ed67
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/pilot/pkg/model/endpointshards.go b/pilot/pkg/model/endpointshards.go
@@ -23,6 +23,7 @@ import (
 	"istio.io/istio/pilot/pkg/serviceregistry/provider"
 	"istio.io/istio/pkg/cluster"
 	"istio.io/istio/pkg/config/schema/kind"
+	"istio.io/istio/pkg/ptr"
 	"istio.io/istio/pkg/util/sets"
 )
 
@@ -100,7 +101,8 @@ func (es *EndpointShards) CopyEndpoints(portMap map[string]int) map[int][]*Istio
 	res := map[int][]*IstioEndpoint{}
 	for _, v := range es.Shards {
 		for _, ep := range v {
-			portNum, f := portMap[ep.ServicePortName]
+			k := ptr.NonEmptyOrDefault(ep.ServicePortNameKey, ep.ServicePortName)
+			portNum, f := portMap[k]
 			if !f {
 				continue
 			}

diff --git a/pilot/pkg/model/push_context.go b/pilot/pkg/model/push_context.go
@@ -1446,7 +1446,7 @@ func (ps *PushContext) initServiceRegistry(env *Environment, configsUpdate sets.
 	for _, s := range allServices {
 		portMap := map[string]int{}
 		for _, port := range s.Ports {
-			portMap[port.Name] = port.Port
+			portMap[fmt.Sprintf("%s~%d", port.Name, port.Port)] = port.Port
 		}
 
 		svcKey := s.Key()

diff --git a/pilot/pkg/model/service.go b/pilot/pkg/model/service.go
@@ -485,7 +485,8 @@ type IstioEndpoint struct {
 	Address string
 
 	// ServicePortName tracks the name of the port, this is used to select the IstioEndpoint by service port.
-	ServicePortName string
+	ServicePortName    string
+	ServicePortNameKey string
 
 	// ServiceAccount holds the associated service account.
 	ServiceAccount string

diff --git a/pilot/pkg/serviceregistry/serviceentry/conversion.go b/pilot/pkg/serviceregistry/serviceentry/conversion.go
@@ -15,6 +15,7 @@
 package serviceentry
 
 import (
+	"fmt"
 	"net/netip"
 	"strings"
 	"time"
@@ -341,11 +342,12 @@ func (s *Controller) convertServiceEntryToInstances(cfg config.Config, services
 				}
 				out = append(out, &model.ServiceInstance{
 					Endpoint: &model.IstioEndpoint{
-						Address:         string(service.Hostname),
-						EndpointPort:    endpointPort,
-						ServicePortName: serviceEntryPort.Name,
-						Labels:          nil,
-						TLSMode:         model.DisabledTLSModeLabel,
+						Address:            string(service.Hostname),
+						EndpointPort:       endpointPort,
+						ServicePortName:    serviceEntryPort.Name,
+						ServicePortNameKey: fmt.Sprintf("%s~%d", serviceEntryPort.Name, serviceEntryPort.Number),
+						Labels:             nil,
+						TLSMode:            model.DisabledTLSModeLabel,
 					},
 					Service:     service,
 					ServicePort: convertPort(serviceEntryPort),