add logs

Author: u-kai

pkg/controllers/gateway_controller.go

@@ -26,12 +26,12 @@ import (
 
 	"github.com/aws/aws-application-networking-k8s/pkg/aws"
 	"github.com/aws/aws-application-networking-k8s/pkg/config"
-	"github.com/aws/aws-application-networking-k8s/pkg/k8s"
 	"github.com/aws/aws-application-networking-k8s/pkg/model/core"
 	lattice_runtime "github.com/aws/aws-application-networking-k8s/pkg/runtime"
 	"github.com/aws/aws-application-networking-k8s/pkg/utils"
 	"github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog"
 
+	"github.com/aws/aws-application-networking-k8s/pkg/k8s"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -72,14 +72,14 @@ func RegisterGatewayController(
 	scheme := mgr.GetScheme()
 	evtRec := mgr.GetEventRecorderFor("gateway")
 
-	ok, err := k8s.IsGVKSupported(mgr, gwv1.GroupVersion.String(), "GatewayClass")
+	ok, err := k8s.IsGVKSupported(mgr, gwv1.GroupVersion.String(), "Gateway")
 	if err != nil {
-		log.Infof(context.TODO(), "Failed to check if GatewayClass is supported: %s", err.Error())
-		return fmt.Errorf("failed to check if GatewayClass is supported: %w", err)
+		log.Infof(context.TODO(), "Failed to check if Gateway is supported: %s", err.Error())
+		return nil
 	}
 	if !ok {
-		log.Infof(context.TODO(), "GatewayClass is not supported, skipping controller registration")
-		return fmt.Errorf("GatewayClass is not supported, skipping controller registration")
+		log.Infof(context.TODO(), "Gateway is not supported, skipping controller registration")
+		return nil
 	}
 	r := &gatewayReconciler{
 		log:              log,

pkg/controllers/gatewayclass_controller.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-application-networking-k8s/pkg/config"
+	"github.com/aws/aws-application-networking-k8s/pkg/k8s"
 	"github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog"
 	"github.com/pkg/errors"
 
@@ -45,6 +46,15 @@ func RegisterGatewayClassController(log gwlog.Logger, mgr ctrl.Manager) error {
 		scheme:                   mgr.GetScheme(),
 		latticeControllerEnabled: false,
 	}
+	ok, err := k8s.IsGVKSupported(mgr, gwv1.GroupVersion.String(), "GatewayClass")
+	if err != nil {
+		log.Infof(context.TODO(), "Failed to check if GatewayClass is supported: %s", err.Error())
+		return nil
+	}
+	if !ok {
+		log.Infof(context.TODO(), "GatewayClass is not supported, skipping controller registration")
+		return nil
+	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&gwv1.GatewayClass{}).
 		Complete(r)

pkg/controllers/route_controller.go

@@ -85,6 +85,7 @@ func RegisterAllRouteControllers(
 	mgr ctrl.Manager,
 ) error {
 	mgrClient := mgr.GetClient()
+
 	gwEventHandler := eventhandlers.NewEnqueueRequestGatewayEvent(log, mgrClient)
 	svcEventHandler := eventhandlers.NewServiceEventHandler(log, mgrClient)
 
@@ -98,6 +99,16 @@ func RegisterAllRouteControllers(
 	}
 
 	for _, routeInfo := range routeInfos {
+		fmt.Println("groupVersion : ", routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Group)
+		fmt.Println("kind : ", routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind)
+		if ok, err := k8s.IsGVKSupported(mgr, routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Group, routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind); !ok {
+			fmt.Printf("Route GroupKind %s is not supported, skipping controller registration\n", routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind)
+
+		} else {
+			if err != nil {
+				return err
+			}
+		}
 		brTgBuilder := gateway.NewBackendRefTargetGroupBuilder(log, mgrClient)
 		reconciler := routeReconciler{
 			routeType:        routeInfo.routeType,