Fix DNSEndpoint owner reference for GRPCRoute (#372)

Author: Doyoon Kim

pkg/deploy/externaldns/dnsendpoint_manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"reflect"
 
+	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	latticemodel "github.com/aws/aws-application-networking-k8s/pkg/model/lattice"
 	"github.com/golang/glog"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -13,7 +14,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/external-dns/endpoint"
-	gateway_api "sigs.k8s.io/gateway-api/apis/v1beta1"
 )
 
 type DnsEndpointManager interface {
@@ -44,12 +44,20 @@ func (s *defaultDnsEndpointManager) Create(ctx context.Context, service *lattice
 		return nil
 	}
 
-	httproute := &gateway_api.HTTPRoute{}
+	var (
+		route core.Route
+		err   error
+	)
 	routeNamespacedName := types.NamespacedName{
 		Namespace: service.Spec.Namespace,
 		Name:      service.Spec.Name,
 	}
-	if err := s.k8sClient.Get(ctx, routeNamespacedName, httproute); err != nil {
+	if service.Spec.RouteType == core.GrpcRouteType {
+		route, err = core.GetGRPCRoute(ctx, s.k8sClient, routeNamespacedName)
+	} else {
+		route, err = core.GetHTTPRoute(ctx, s.k8sClient, routeNamespacedName)
+	}
+	if err != nil {
 		glog.V(2).Infof("Skipping creation of %s: Could not find corresponding route", namespacedName.String())
 		return nil
 	}
@@ -77,7 +85,7 @@ func (s *defaultDnsEndpointManager) Create(ctx context.Context, service *lattice
 					},
 				},
 			}
-			controllerutil.SetControllerReference(httproute, ep, s.k8sClient.Scheme())
+			controllerutil.SetControllerReference(route.K8sObject(), ep, s.k8sClient.Scheme())
 			if err = s.k8sClient.Create(ctx, ep); err != nil {
 				glog.V(2).Infof("Failed creating DNSEndpoint: %s", err.Error())
 				return err

pkg/gateway/model_build_lattice_service.go

@@ -115,12 +115,15 @@ func (t *latticeServiceModelBuildTask) buildModel(ctx context.Context) error {
 }
 
 func (t *latticeServiceModelBuildTask) buildLatticeService(ctx context.Context) error {
-	pro := "HTTP"
-	protocols := []*string{&pro}
+	routeType := core.HttpRouteType
+	if _, ok := t.route.(*core.GRPCRoute); ok {
+		routeType = core.GrpcRouteType
+	}
+
 	spec := latticemodel.ServiceSpec{
 		Name:      t.route.Name(),
 		Namespace: t.route.Namespace(),
-		Protocols: protocols,
+		RouteType: routeType,
 		//ServiceNetworkNames: string(t.route.Spec().ParentRefs()[0].Name),
 	}
 

pkg/gateway/model_build_lattice_service_test.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/aws/aws-application-networking-k8s/pkg/k8s"
 	latticemodel "github.com/aws/aws-application-networking-k8s/pkg/model/lattice"
+	gateway_api_v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 )
 
 func Test_LatticeServiceModelBuild(t *testing.T) {
@@ -55,6 +56,7 @@ func Test_LatticeServiceModelBuild(t *testing.T) {
 		wantError     error
 		wantErrIsNil  bool
 		wantName      string
+		wantRouteType core.RouteType
 		wantIsDeleted bool
 	}{
 		{
@@ -80,6 +82,7 @@ func Test_LatticeServiceModelBuild(t *testing.T) {
 
 			wantError:     nil,
 			wantName:      "service1",
+			wantRouteType: core.HttpRouteType,
 			wantIsDeleted: false,
 			wantErrIsNil:  true,
 		},
@@ -102,6 +105,29 @@ func Test_LatticeServiceModelBuild(t *testing.T) {
 
 			wantError:     nil,
 			wantName:      "service1",
+			wantRouteType: core.HttpRouteType,
+			wantIsDeleted: false,
+			wantErrIsNil:  true,
+		},
+		{
+			name: "Add LatticeService with GRPCRoute",
+			route: core.NewGRPCRoute(gateway_api_v1alpha2.GRPCRoute{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "service1",
+				},
+				Spec: gateway_api_v1alpha2.GRPCRouteSpec{
+					CommonRouteSpec: gateway_api.CommonRouteSpec{
+						ParentRefs: []gateway_api.ParentReference{
+							{
+								Name: "gateway1",
+							},
+						},
+					},
+				},
+			}),
+			wantError:     nil,
+			wantName:      "service1",
+			wantRouteType: core.GrpcRouteType,
 			wantIsDeleted: false,
 			wantErrIsNil:  true,
 		},
@@ -139,6 +165,7 @@ func Test_LatticeServiceModelBuild(t *testing.T) {
 
 			wantError:     nil,
 			wantName:      "service2",
+			wantRouteType: core.HttpRouteType,
 			wantIsDeleted: true,
 			wantErrIsNil:  true,
 		},

pkg/model/lattice/service.go

@@ -14,8 +14,9 @@ type Service struct {
 }
 
 type ServiceSpec struct {
-	Name                string    `json:"name"`
-	Namespace           string    `json:"namespace"`
+	Name                string `json:"name"`
+	Namespace           string `json:"namespace"`
+	RouteType           core.RouteType
 	Protocols           []*string `json:"protocols"`
 	ServiceNetworkNames []string  `json:"servicenetworkhname"`
 	CustomerDomainName  string    `json:"customerdomainname"`