filter gateways

Change-Id: Id002c733688759d3dfbad8975e53805d626f2d01

Author: aojea

pkg/controller/controller.go

@@ -276,6 +276,13 @@ func startCloudControllerManager(ctx context.Context, clusterName string, config
 		return nil, err
 	}
 
+	err = gatewayController.Init(ctx)
+	if err != nil {
+		klog.Errorf("Failed to initialize gateway controller: %v", err)
+		cancel()
+		return nil, err
+	}
+
 	go gatewayController.Run(ctx)
 
 	sharedGwInformers.Start(ctx.Done())

pkg/gateway/controller.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	controllerName = "kind.sigs.k8s.io/gateway-controller"
-	gwClassName    = "cloud-provider-kind"
+	GWClassName    = "cloud-provider-kind"
 	maxRetries     = 5
 	workers        = 5
 )
@@ -73,7 +73,7 @@ func New(
 	_, err := gatewayInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {
 			gw := obj.(*gatewayv1.Gateway)
-			if gw.Spec.GatewayClassName != gwClassName {
+			if gw.Spec.GatewayClassName != GWClassName {
 				return
 			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
@@ -83,7 +83,7 @@ func New(
 		},
 		UpdateFunc: func(oldObj, newObj interface{}) {
 			gw := newObj.(*gatewayv1.Gateway)
-			if gw.Spec.GatewayClassName != gwClassName {
+			if gw.Spec.GatewayClassName != GWClassName {
 				return
 			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(newObj)
@@ -93,7 +93,7 @@ func New(
 		},
 		DeleteFunc: func(obj interface{}) {
 			gw := obj.(*gatewayv1.Gateway)
-			if gw.Spec.GatewayClassName != gwClassName {
+			if gw.Spec.GatewayClassName != GWClassName {
 				return
 			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
@@ -108,18 +108,30 @@ func New(
 
 	_, err = httprouteInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {
+			httproute := obj.(*gatewayv1.HTTPRoute)
+			if !c.isOwned(httproute.Spec.ParentRefs) {
+				return
+			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 			if err == nil {
 				c.httproutequeue.Add(key)
 			}
 		},
 		UpdateFunc: func(oldObj, newObj interface{}) {
+			httproute := newObj.(*gatewayv1.HTTPRoute)
+			if !c.isOwned(httproute.Spec.ParentRefs) {
+				return
+			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(newObj)
 			if err == nil {
 				c.httproutequeue.Add(key)
 			}
 		},
 		DeleteFunc: func(obj interface{}) {
+			httproute := obj.(*gatewayv1.HTTPRoute)
+			if !c.isOwned(httproute.Spec.ParentRefs) {
+				return
+			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 			if err == nil {
 				c.httproutequeue.Add(key)
@@ -132,18 +144,30 @@ func New(
 
 	_, err = grpcrouteInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {
+			grpcroute := obj.(*gatewayv1.GRPCRoute)
+			if !c.isOwned(grpcroute.Spec.ParentRefs) {
+				return
+			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 			if err == nil {
 				c.grpcroutequeue.Add(key)
 			}
 		},
 		UpdateFunc: func(oldObj, newObj interface{}) {
+			grpcroute := newObj.(*gatewayv1.GRPCRoute)
+			if !c.isOwned(grpcroute.Spec.ParentRefs) {
+				return
+			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(newObj)
 			if err == nil {
 				c.grpcroutequeue.Add(key)
 			}
 		},
 		DeleteFunc: func(obj interface{}) {
+			grpcroute := obj.(*gatewayv1.GRPCRoute)
+			if !c.isOwned(grpcroute.Spec.ParentRefs) {
+				return
+			}
 			key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 			if err == nil {
 				c.grpcroutequeue.Add(key)
@@ -157,35 +181,43 @@ func New(
 	return c, nil
 }
 
-// Run begins watching and syncing.
-func (c *Controller) Run(ctx context.Context) error {
+// Init install CRDs and creates GatewayClass
+func (c *Controller) Init(ctx context.Context) error {
 	defer runtime.HandleCrashWithContext(ctx)
-
-	// Let the workers stop when we are done
-	defer c.gatewayqueue.ShutDown()
-	defer c.httproutequeue.ShutDown()
-	defer c.grpcroutequeue.ShutDown()
-	klog.Info("Starting Gateway API controller")
+	// Install GatewayAPI CRDs if do not exist
 
 	// Create GatewayClass if it does not exist
 	gwClass := gatewayv1.GatewayClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: gwClassName,
+			Name: GWClassName,
 		},
 		Spec: gatewayv1.GatewayClassSpec{
 			ControllerName: controllerName,
 			Description:    ptr.To("cloud-provider-kind gateway API"),
 		},
 	}
 
-	if _, err := c.gwClient.GatewayV1().GatewayClasses().Get(ctx, gwClassName, metav1.GetOptions{}); apierrors.IsNotFound(err) {
+	if _, err := c.gwClient.GatewayV1().GatewayClasses().Get(ctx, GWClassName, metav1.GetOptions{}); apierrors.IsNotFound(err) {
 		_, err := c.gwClient.GatewayV1().GatewayClasses().Create(ctx, &gwClass, metav1.CreateOptions{})
 		if err != nil {
 			klog.Infof("faile to create cloud-provider-kind GatewayClass: %v")
 			return err
 		}
 	}
 
+	return nil
+}
+
+// Run begins watching and syncing.
+func (c *Controller) Run(ctx context.Context) error {
+	defer runtime.HandleCrashWithContext(ctx)
+
+	// Let the workers stop when we are done
+	defer c.gatewayqueue.ShutDown()
+	defer c.httproutequeue.ShutDown()
+	defer c.grpcroutequeue.ShutDown()
+	klog.Info("Starting Gateway API controller")
+
 	// Wait for all involved caches to be synced, before processing items from the queue is started
 	if !cache.WaitForNamedCacheSync(controllerName, ctx.Done(), c.gatewayListerSynced, c.httprouteListerSynced, c.grpcrouteListerSynced) {
 		return fmt.Errorf("Timed out waiting for caches to sync")
@@ -201,3 +233,23 @@ func (c *Controller) Run(ctx context.Context) error {
 	klog.Info("Stopping Gateway API controller")
 	return nil
 }
+
+func (c *Controller) isOwned(references []gatewayv1.ParentReference) bool {
+	for _, ref := range references {
+		if string(*ref.Group) != "gateway.networking.k8s.io" && string(*ref.Group) != "" {
+			continue
+		}
+		if string(*ref.Kind) != "Gateway" {
+			continue
+		}
+
+		gw, err := c.gatewayLister.Gateways(string(*ref.Namespace)).Get(string(ref.Name))
+		if err != nil {
+			continue
+		}
+		if gw.Spec.GatewayClassName == GWClassName {
+			return true
+		}
+	}
+	return false
+}