Fix TG creation when using named targetPorts (#243)

* Fix TG creation when using named targetPorts

* Used fixed default port 80 when creating HTTP targetgroups

Author: Doyoon Kim

pkg/gateway/model_build_targetgroup.go

@@ -2,6 +2,7 @@ package gateway
 
 import (
 	"context"
+
 	"github.com/golang/glog"
 
 	corev1 "k8s.io/api/core/v1"
@@ -186,7 +187,8 @@ func (t *targetGroupModelBuildTask) BuildTargetGroup(ctx context.Context) error
 		Type: latticemodel.TargetGroupTypeIP,
 		Config: latticemodel.TargetGroupConfig{
 			VpcID: config.VpcID,
-			//Port:            backendServicePort,
+			// Fill in default HTTP port as we are using target port anyway.
+			Port:                80,
 			IsServiceImport:     false,
 			IsServiceExport:     true,
 			K8SServiceName:      t.serviceExport.Name,
@@ -196,11 +198,6 @@ func (t *targetGroupModelBuildTask) BuildTargetGroup(ctx context.Context) error
 		},
 	}
 
-	glog.V(6).Infof("Found backend service port %v , intval %v \n", svc.Spec.Ports[0].TargetPort,
-		svc.Spec.Ports[0].TargetPort.IntVal)
-
-	tgSpec.Config.Port = svc.Spec.Ports[0].TargetPort.IntVal
-
 	tg := latticemodel.NewTargetGroup(t.stack, tgName, tgSpec)
 	glog.V(6).Infof("buildTargetGroup, tg[%s], tgSpec%v \n", tgName, tg)
 
@@ -290,9 +287,6 @@ func (t *latticeServiceModelBuildTask) buildHTTPTargetGroupSpec(ctx context.Cont
 	var vpc = config.VpcID
 	var ekscluster = ""
 	var isServiceImport bool
-	var backendServicePort int32
-
-	isServiceImport = false
 
 	if backendKind == "ServiceImport" {
 		namespaceName := types.NamespacedName{
@@ -329,14 +323,6 @@ func (t *latticeServiceModelBuildTask) buildHTTPTargetGroupSpec(ctx context.Cont
 			glog.V(6).Infof("Error finding backend service %v error :%v \n", serviceNamespaceName, err)
 			return latticemodel.TargetGroupSpec{}, err
 		}
-
-		if svc.Spec.Ports != nil {
-			glog.V(6).Infof("Found backend service port %v , intval %v \n", svc.Spec.Ports[0].TargetPort,
-				svc.Spec.Ports[0].TargetPort.IntVal)
-
-			backendServicePort = svc.Spec.Ports[0].TargetPort.IntVal
-		}
-
 	}
 
 	tgName := latticestore.TargetGroupName(string(httpBackendRef.Name), namespace)
@@ -363,7 +349,8 @@ func (t *latticeServiceModelBuildTask) buildHTTPTargetGroupSpec(ctx context.Cont
 			K8SHTTPRouteNamespace: t.httpRoute.Namespace,
 			Protocol:              "HTTP",
 			ProtocolVersion:       vpclattice.TargetGroupProtocolVersionHttp1,
-			Port:                  backendServicePort,
+			// Fill in default HTTP port as we are using target port anyway.
+			Port: 80,
 		},
 		IsDeleted: isDeleted,
 	}, nil

test/suites/integration/httproute_path_match_test.go

@@ -2,17 +2,19 @@ package integration
 
 import (
 	"fmt"
-	"github.com/aws/aws-application-networking-k8s/pkg/latticestore"
-	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
-	"github.com/aws/aws-sdk-go/service/vpclattice"
+	"log"
+	"os"
+	"time"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/samber/lo"
 	"k8s.io/apimachinery/pkg/types"
-	"log"
-	"os"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"time"
+
+	"github.com/aws/aws-application-networking-k8s/pkg/latticestore"
+	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
+	"github.com/aws/aws-sdk-go/service/vpclattice"
 )
 
 const (
@@ -21,11 +23,11 @@ const (
 
 var _ = Describe("HTTPRoute path matches", func() {
 	It("HTTPRoute should support multiple path matches", func() {
-		gateway := testFramework.NewGateway("",k8snamespace)
+		gateway := testFramework.NewGateway("", k8snamespace)
 		deployment1, service1 := testFramework.NewHttpApp(test.HTTPAppOptions{Name: "test-v1", Namespace: k8snamespace})
 		deployment2, service2 := testFramework.NewHttpApp(test.HTTPAppOptions{Name: "test-v2", Namespace: k8snamespace})
 		pathMatchHttpRoute := testFramework.NewPathMatchHttpRoute(gateway, []client.Object{service1, service2}, "http",
-	"", k8snamespace)
+			"", k8snamespace)
 
 		// Create Kubernetes API Objects
 		testFramework.ExpectCreated(ctx,
@@ -46,7 +48,7 @@ var _ = Describe("HTTPRoute path matches", func() {
 		Expect(*targetGroupV1.VpcIdentifier).To(Equal(os.Getenv("CLUSTER_VPC_ID")))
 		Expect(*targetGroupV1.Protocol).To(Equal("HTTP"))
 		targetsV1 := testFramework.GetTargets(ctx, targetGroupV1, deployment1)
-		Expect(*targetGroupV1.Port).To(BeEquivalentTo(service1.Spec.Ports[0].TargetPort.IntVal))
+		Expect(*targetGroupV1.Port).To(BeEquivalentTo(80))
 		for _, target := range targetsV1 {
 			Expect(*target.Port).To(BeEquivalentTo(service1.Spec.Ports[0].TargetPort.IntVal))
 			Expect(*target.Status).To(Or(
@@ -59,7 +61,7 @@ var _ = Describe("HTTPRoute path matches", func() {
 		Expect(*targetGroupV2.VpcIdentifier).To(Equal(os.Getenv("CLUSTER_VPC_ID")))
 		Expect(*targetGroupV2.Protocol).To(Equal("HTTP"))
 		targetsV2 := testFramework.GetTargets(ctx, targetGroupV2, deployment2)
-		Expect(*targetGroupV2.Port).To(BeEquivalentTo(service2.Spec.Ports[0].TargetPort.IntVal))
+		Expect(*targetGroupV2.Port).To(BeEquivalentTo(80))
 		for _, target := range targetsV2 {
 			Expect(*target.Port).To(BeEquivalentTo(service2.Spec.Ports[0].TargetPort.IntVal))
 			Expect(*target.Status).To(Or(

test/suites/integration/https_listener_weighted_rule_with_service_export_import_test.go

@@ -2,17 +2,19 @@ package integration
 
 import (
 	"fmt"
-	"github.com/aws/aws-application-networking-k8s/pkg/latticestore"
-	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
-	"github.com/aws/aws-sdk-go/service/vpclattice"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"github.com/samber/lo"
-	appsv1 "k8s.io/api/apps/v1"
 	"log"
 	"os"
 	"strings"
 	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/samber/lo"
+	appsv1 "k8s.io/api/apps/v1"
+
+	"github.com/aws/aws-application-networking-k8s/pkg/latticestore"
+	"github.com/aws/aws-application-networking-k8s/test/pkg/test"
+	"github.com/aws/aws-sdk-go/service/vpclattice"
 )
 
 var _ = Describe("Test 2 listeners gateway with weighted httproute rules and service export import", func() {
@@ -61,7 +63,7 @@ var _ = Describe("Test 2 listeners gateway with weighted httproute rules and ser
 				Expect(*retrievedTargetGroupSummary.Protocol).To(Equal("HTTP"))
 				targets := testFramework.GetTargets(ctx, retrievedTargetGroupSummary, deployments[i])
 				Expect(len(targets)).To(BeEquivalentTo(1))
-				Expect(*retrievedTargetGroupSummary.Port).To(BeEquivalentTo(service1.Spec.Ports[0].TargetPort.IntVal))
+				Expect(*retrievedTargetGroupSummary.Port).To(BeEquivalentTo(80))
 				for _, target := range targets {
 					Expect(*target.Port).To(BeEquivalentTo(service1.Spec.Ports[0].TargetPort.IntVal))
 					Expect(*target.Status).To(Or(