update route bug

Author: u-kai

.github/workflows/e2e-test.yaml

@@ -4,9 +4,9 @@ permissions:
   contents: read
 on:
   # TODO: Find a secure enough way to run e2e tests from PR on-demand.
-  push:
-    branches:
-      - main
+  #push:
+  #  branches:
+  #    - main
   workflow_dispatch:
 jobs:
   e2e-test:

helm/values.yaml

@@ -5,6 +5,8 @@
 image:
   repository: 111815285043.dkr.ecr.ap-northeast-1.amazonaws.com/aws-gateway-controller
   tag: latest
+  # repository: public.ecr.aws/aws-application-networking-k8s/aws-gateway-controller
+  # tag: v1.1.0
   pullPolicy: Always
   pullSecrets: []
 
@@ -77,7 +79,9 @@ serviceAccount:
   annotations:
     {}
     # eks.amazonaws.com/role-arn: arn:aws:iam::AWS_ACCOUNT_ID:role/IAM_ROLE_NAME
-
+awsRegion: ap-northeast-1
+awsAccountId: 111815285043
+clusterVpcId: vpc-04a3485e6f724b770
 clusterName: eks-auto-mode-sample
 defaultServiceNetwork: lattice-gateway
 latticeEndpoint:

helm/zf26z

@@ -67,6 +67,9 @@ func configInit(sess *session.Session, metadata EC2Metadata) error {
 	}
 
 	if ClusterName = os.Getenv(CLUSTER_NAME); ClusterName == "" {
+		if sess == nil {
+			return fmt.Errorf("cluster name is not specified")
+		}
 		if ClusterName, err = getClusterName(sess, Region); err != nil {
 			return fmt.Errorf("cannot get cluster name: %s", err)
 		}

pkg/config/controller_config.go

@@ -114,21 +114,6 @@ func RegisterAllRouteControllers(
 	}
 
 	for _, routeInfo := range routeInfos {
-		gv := routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().GroupVersion().String()
-		kind := routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind
-		log.Infof(context.TODO(), "GVK: %s, %s", gv, kind)
-		if ok, err := k8s.IsGVKSupported(mgr, gv, kind); !ok {
-			log.Infof(context.TODO(), "GVK not supported gv: %s, kind: %s", gv, kind)
-			if err != nil {
-				log.Infof(context.TODO(), "GVK not supported error: %s", err)
-				return nil
-			}
-		} else {
-			log.Infof(context.TODO(), "GVK supported gv: %s, kind: %s", gv, kind)
-			if err != nil {
-				return err
-			}
-		}
 		brTgBuilder := gateway.NewBackendRefTargetGroupBuilder(log, mgrClient)
 		reconciler := routeReconciler{
 			routeType:        routeInfo.routeType,
@@ -200,8 +185,6 @@ func (r *routeReconciler) reconcile(ctx context.Context, req ctrl.Request) error
 	if err != nil {
 		return client.IgnoreNotFound(err)
 	}
-	r.log.Debugw(ctx, "u-kai reconcile after getRoute", "route", route)
-
 	if err = r.client.Get(ctx, req.NamespacedName, route.K8sObject()); err != nil {
 		return client.IgnoreNotFound(err)
 	}
@@ -293,8 +276,7 @@ func (r *routeReconciler) isRouteRelevant(ctx context.Context, route core.Route)
 	// make sure gateway is an aws-vpc-lattice
 	gwClass := &gwv1.GatewayClass{}
 	gwClassName := types.NamespacedName{
-		Namespace: defaultNamespace,
-		Name:      string(gw.Spec.GatewayClassName),
+		Name: string(gw.Spec.GatewayClassName),
 	}
 
 	if err := r.client.Get(ctx, gwClassName, gwClass); err != nil {

pkg/controllers/route_controller.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"context"
+	"testing"
+
 	mock_client "github.com/aws/aws-application-networking-k8s/mocks/controller-runtime/client"
 	anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
 	aws2 "github.com/aws/aws-application-networking-k8s/pkg/aws"
@@ -27,7 +29,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/external-dns/endpoint"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
-	"testing"
 )
 
 func TestRouteReconciler_ReconcileCreates(t *testing.T) {
@@ -52,8 +53,7 @@ func TestRouteReconciler_ReconcileCreates(t *testing.T) {
 
 	gwClass := &gwv1.GatewayClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "amazon-vpc-lattice",
-			Namespace: defaultNamespace,
+			Name: "amazon-vpc-lattice",
 		},
 		Spec: gwv1.GatewayClassSpec{
 			ControllerName: config.LatticeGatewayControllerName,

pkg/controllers/route_controller_test.go

@@ -125,15 +125,20 @@ func (t *latticeServiceModelBuildTask) buildLatticeService(ctx context.Context)
 
 	for _, parentRef := range t.route.Spec().ParentRefs() {
 		gw := &gwv1.Gateway{}
-		err := t.client.Get(ctx, client.ObjectKey{Name: string(parentRef.Name), Namespace: string(*parentRef.Namespace)}, gw)
+		t.log.Debugf(ctx, "Getting gateway %s-%v", parentRef.Name, parentRef.Namespace)
+		parentNamespace := t.route.Namespace()
+		if parentRef.Namespace != nil {
+			parentNamespace = string(*parentRef.Namespace)
+		}
+		err := t.client.Get(ctx, client.ObjectKey{Name: string(parentRef.Name), Namespace: parentNamespace}, gw)
 		if err != nil {
-			t.log.Infof(ctx, "u-kai: Failed to get gateway %s-%s: %v", parentRef.Name, *parentRef.Namespace, err)
+			t.log.Infof(ctx, "u-kai: Failed to get gateway %s-%s: %v", parentRef.Name, parentNamespace, err)
 			continue
 		}
 		gwClass := &gwv1.GatewayClass{}
-		err = t.client.Get(ctx, client.ObjectKey{Name: string(gw.Spec.GatewayClassName), Namespace: gw.Namespace}, gwClass)
+		err = t.client.Get(ctx, client.ObjectKey{Name: string(gw.Spec.GatewayClassName)}, gwClass)
 		if err != nil {
-			t.log.Infof(ctx, "u-kai: Failed to get gateway class %s-%s: %v", gw.Spec.GatewayClassName, gw.Namespace, err)
+			t.log.Infof(ctx, "u-kai: Failed to get gateway class %s-%s: %v", gw.Spec.GatewayClassName, "default", err)
 			continue
 		}
 		if gwClass.Spec.ControllerName != config.LatticeGatewayControllerName {