Fix build for controller-runtime breaking changes

Breaking changes are in: kubernetes-sigs/controller-runtime#2783
netobserv · Jun 17, 2024 · 5514536 · 5514536
1 parent b5eb28c
commit 5514536
Show file tree

Hide file tree

Showing 6 changed files with 489 additions and 231 deletions.
diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml
diff --git a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml
diff --git a/docs/FlowCollector.md b/docs/FlowCollector.md
diff --git a/pkg/narrowcache/client.go b/pkg/narrowcache/client.go
@@ -203,7 +203,7 @@ func (c *Client) callHandlers(ctx context.Context, key string, ev watch.Event) {
 	}
 }
 
-func (c *Client) GetSource(ctx context.Context, obj client.Object) (source.Source, error) {
+func (c *Client) GetSource(ctx context.Context, obj client.Object, h handler.EventHandler) (source.Source, error) {
 	// Prepare a Source and make sure it is associated with a watch
 	rlog := log.FromContext(ctx).WithName("narrowcache")
 	rlog.WithValues("name", obj.GetName(), "namespace", obj.GetNamespace()).Info("Getting Source:")
@@ -223,7 +223,8 @@ func (c *Client) GetSource(ctx context.Context, obj client.Object) (source.Sourc
 	}
 
 	return &NarrowSource{
-		onStart: func(ctx context.Context, h handler.EventHandler, q workqueue.RateLimitingInterface) {
+		handler: h,
+		onStart: func(ctx context.Context, q workqueue.RateLimitingInterface) {
 			c.addHandler(key, handlerOnQueue{handler: h, queue: q})
 		},
 	}, nil

diff --git a/pkg/narrowcache/source.go b/pkg/narrowcache/source.go
@@ -2,19 +2,23 @@ package narrowcache
 
 import (
 	"context"
+	"errors"
 
 	"k8s.io/client-go/util/workqueue"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 type NarrowSource struct {
 	source.Source
-	onStart func(ctx context.Context, h handler.EventHandler, q workqueue.RateLimitingInterface)
+	handler handler.EventHandler
+	onStart func(ctx context.Context, q workqueue.RateLimitingInterface)
 }
 
-func (s *NarrowSource) Start(ctx context.Context, h handler.EventHandler, q workqueue.RateLimitingInterface, _ ...predicate.Predicate) error {
-	s.onStart(ctx, h, q)
+func (s *NarrowSource) Start(ctx context.Context, q workqueue.RateLimitingInterface) error {
+	if s.handler == nil {
+		return errors.New("must specify NarrowSource.handler")
+	}
+	s.onStart(ctx, q)
 	return nil
 }
diff --git a/pkg/watchers/watcher.go b/pkg/watchers/watcher.go
@@ -79,15 +79,9 @@ func (w *Watcher) watch(ctx context.Context, cl *narrowcache.Client, kind flowsl
 		// Don't register again
 		return nil
 	}
-	s, err := cl.GetSource(ctx, obj)
-	if err != nil {
-		return err
-	}
-	// Note that currently, watches are never removed (they can't - cf https://github.com/kubernetes-sigs/controller-runtime/issues/1884)
-	// This isn't a big deal here, as the number of watches that we set is very limited and not meant to grow over and over
-	// (unless user keeps reconfiguring cert references endlessly)
-	err = w.ctrl.Watch(
-		s,
+	s, err := cl.GetSource(
+		ctx,
+		obj,
 		handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, o client.Object) []reconcile.Request {
 			// The watch might be registered, but inactive
 			k := key(kind, o.GetName(), o.GetNamespace())
@@ -104,6 +98,13 @@ func (w *Watcher) watch(ctx context.Context, cl *narrowcache.Client, kind flowsl
 	if err != nil {
 		return err
 	}
+	// Note that currently, watches are never removed (they can't - cf https://github.com/kubernetes-sigs/controller-runtime/issues/1884)
+	// This isn't a big deal here, as the number of watches that we set is very limited and not meant to grow over and over
+	// (unless user keeps reconfiguring cert references endlessly)
+	err = w.ctrl.Watch(s)
+	if err != nil {
+		return err
+	}
 	return nil
 }