fix(meshservice): fix inbound port selecting logic on MeshService (#13108)

## Motivation

Fixing an issue on the MeshService updater

## Implementation information

> update MeshService updater to take into account target port

## Supporting documentation

<!-- Is there a MADR? An Issue? A related PR? -->

fixes #12042

<!--
> Changelog: skip
-->
<!--
Uncomment the above section to explicitly set a [`> Changelog:` entry
here](https://github.com/kumahq/kuma/blob/master/CONTRIBUTING.md#submitting-a-patch)?
-->

---------

Signed-off-by: Jay Chen <[email protected]>

Author: jijiechen

pkg/core/resources/apis/meshservice/match.go

@@ -1,6 +1,8 @@
 package meshservice
 
 import (
+	"k8s.io/apimachinery/pkg/util/intstr"
+
 	mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
 	core_mesh "github.com/kumahq/kuma/pkg/core/resources/apis/mesh"
 	meshservice_api "github.com/kumahq/kuma/pkg/core/resources/apis/meshservice/api/v1alpha1"
@@ -140,3 +142,13 @@ func matchByTags(
 	}
 	return dpps
 }
+
+func MatchInboundWithMeshServicePort(inbound *mesh_proto.Dataplane_Networking_Inbound, meshServicePort meshservice_api.Port) bool {
+	switch meshServicePort.TargetPort.Type {
+	case intstr.Int:
+		return uint32(meshServicePort.TargetPort.IntVal) == inbound.Port
+	case intstr.String:
+		return meshServicePort.TargetPort.StrVal == inbound.Name
+	}
+	return false
+}

pkg/core/resources/apis/meshservice/status/updater.go

@@ -165,7 +165,7 @@ func (s *StatusUpdater) updateStatus(ctx context.Context) error {
 func buildDataplaneProxies(
 	dpps []*core_mesh.DataplaneResource,
 	insightsByKey map[core_model.ResourceKey]*core_mesh.DataplaneInsightResource,
-	ports []meshservice_api.Port,
+	meshServicePorts []meshservice_api.Port,
 ) meshservice_api.DataplaneProxies {
 	result := meshservice_api.DataplaneProxies{}
 	for _, dpp := range dpps {
@@ -176,32 +176,22 @@ func buildDataplaneProxies(
 			}
 		}
 		healthyInbounds := 0
-		for _, port := range ports {
-			if inbound := dpInboundForMeshServicePort(dpp.Spec.GetNetworking().Inbound, port); inbound != nil {
-				if inbound.State == mesh_proto.Dataplane_Networking_Inbound_Ready {
+		for _, meshServicePort := range meshServicePorts {
+			for _, dpInbound := range dpp.Spec.GetNetworking().Inbound {
+				if dpInbound.State == mesh_proto.Dataplane_Networking_Inbound_Ready &&
+					meshservice.MatchInboundWithMeshServicePort(dpInbound, meshServicePort) {
 					healthyInbounds++
+					break
 				}
 			}
 		}
-		if healthyInbounds == len(ports) {
+		if healthyInbounds == len(meshServicePorts) {
 			result.Healthy++
 		}
 	}
 	return result
 }
 
-func dpInboundForMeshServicePort(inbounds []*mesh_proto.Dataplane_Networking_Inbound, port meshservice_api.Port) *mesh_proto.Dataplane_Networking_Inbound {
-	for _, inbound := range inbounds {
-		if port.Name != "" && inbound.Name == port.Name {
-			return inbound
-		}
-		if port.Port == inbound.Port {
-			return inbound
-		}
-	}
-	return nil
-}
-
 func buildTLS(
 	existing meshservice_api.TLS,
 	dpps []*core_mesh.DataplaneResource,

pkg/core/resources/apis/meshservice/status/updater_test.go

@@ -230,10 +230,10 @@ var _ = Describe("Updater", func() {
 				Total:     3,
 			},
 		}),
-		Entry("should count healthy DPPs", dpProxiesTestCase{
+		Entry("should count healthy DPPs and use MeshService.ports[].targetPort to select DP inbound", dpProxiesTestCase{
 			meshService: samples.MeshServiceBackendBuilder().
 				WithDataplaneTagsSelectorKV("app", "backend").
-				AddIntPort(builders.FirstInboundPort+1, builders.FirstInboundServicePort+1, core_mesh.ProtocolHTTP),
+				AddIntPort(builders.FirstInboundServicePort+1, builders.FirstInboundPort+1, core_mesh.ProtocolHTTP),
 			dpps: []*builders.DataplaneBuilder{
 				builders.Dataplane().
 					WithName("dp-all-inbounds-healthy").

pkg/xds/topology/outbound.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/asaskevich/govalidator"
 	"github.com/pkg/errors"
-	"k8s.io/apimachinery/pkg/util/intstr"
 
 	common_tls "github.com/kumahq/kuma/api/common/v1alpha1/tls"
 	mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
@@ -339,15 +338,8 @@ func fillLocalMeshServices(
 			dpNetworking := dpp.Spec.GetNetworking()
 			for _, inbound := range dpNetworking.GetHealthyInbounds() {
 				for _, port := range meshSvc.Spec.Ports {
-					switch port.TargetPort.Type {
-					case intstr.Int:
-						if uint32(port.TargetPort.IntVal) != inbound.Port {
-							continue
-						}
-					case intstr.String:
-						if port.TargetPort.StrVal != inbound.Name {
-							continue
-						}
+					if !meshservice.MatchInboundWithMeshServicePort(inbound, port) {
+						continue
 					}
 
 					inboundTags := maps.Clone(inbound.GetTags())