fileinformer: update interface for 1.26

Author: jzelinskie

fileinformer/file_informer.go

@@ -145,7 +145,7 @@ type FileSharedIndexInformer struct {
 	handlers                        []cache.ResourceEventHandler
 }
 
-var _ cache.SharedIndexInformer = &FileSharedIndexInformer{}
+var _ cache.SharedIndexInformer = (*FileSharedIndexInformer)(nil)
 
 // NewFileSharedIndexInformer creates a new informer watching the file
 // Note that currently all event handlers share the default resync period.
@@ -159,11 +159,13 @@ func NewFileSharedIndexInformer(log logr.Logger, fileName string, watcher *fsnot
 	}
 }
 
-func (f *FileSharedIndexInformer) AddEventHandler(handler cache.ResourceEventHandler) {
-	f.AddEventHandlerWithResyncPeriod(handler, f.defaultEventHandlerResyncPeriod)
+func (f *FileSharedIndexInformer) IsStopped() bool { return !f.started }
+
+func (f *FileSharedIndexInformer) AddEventHandler(handler cache.ResourceEventHandler) (cache.ResourceEventHandlerRegistration, error) {
+	return f.AddEventHandlerWithResyncPeriod(handler, f.defaultEventHandlerResyncPeriod)
 }
 
-func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.ResourceEventHandler, resyncPeriod time.Duration) {
+func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.ResourceEventHandler, resyncPeriod time.Duration) (cache.ResourceEventHandlerRegistration, error) {
 	f.RLock()
 	if f.started {
 		panic("cannot add event handlers after informer has started")
@@ -173,6 +175,14 @@ func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.
 	defer f.Unlock()
 	f.handlers = append(f.handlers, handler)
 	// TODO: non-default resync period
+
+	return nil, nil
+}
+
+// RemoveEventHandler implements cache.SharedInformer
+func (*FileSharedIndexInformer) RemoveEventHandler(handle cache.ResourceEventHandlerRegistration) error {
+	// TODO implement me
+	panic("unimplemented")
 }
 
 func (f *FileSharedIndexInformer) GetStore() cache.Store {

fileinformer/file_informer_test.go

@@ -32,9 +32,11 @@ func TestFileInformer(t *testing.T) {
 	eventHandlers2.On("OnAdd", file2.Name()).Return()
 
 	inf := informerFactory.ForResource(FileGroupVersion.WithResource(file.Name())).Informer()
-	inf.AddEventHandler(eventHandlers)
+	_, err = inf.AddEventHandler(eventHandlers)
+	require.NoError(t, err)
 	inf2 := informerFactory.ForResource(FileGroupVersion.WithResource(file2.Name())).Informer()
-	inf2.AddEventHandler(eventHandlers2)
+	_, err = inf2.AddEventHandler(eventHandlers2)
+	require.NoError(t, err)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	informerFactory.Start(ctx.Done())
@@ -76,7 +78,7 @@ func TestFileInformer(t *testing.T) {
 		eventHandlers.Lock()
 		defer eventHandlers.Unlock()
 		return len(eventHandlers.Calls) == 4
-	}, 500*time.Millisecond, 10*time.Millisecond)
+	}, 5000*time.Millisecond, 100*time.Millisecond)
 
 	cancel()
 

static/controller.go

@@ -47,11 +47,14 @@ func NewStaticController[K bootstrap.KubeResourceObject](log logr.Logger, name s
 
 func (c *Controller[K]) Start(ctx context.Context, numThreads int) {
 	inf := c.fileInformerFactory.ForResource(c.staticClusterResource).Informer()
-	inf.AddEventHandler(cache.ResourceEventHandlerFuncs{
+	_, err := inf.AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc:    func(obj interface{}) { c.handleStaticResource(ctx) },
 		UpdateFunc: func(_, obj interface{}) { c.handleStaticResource(ctx) },
 		DeleteFunc: func(obj interface{}) { c.handleStaticResource(ctx) },
 	})
+	if err != nil {
+		panic("failed to add handlers: " + err.Error())
+	}
 	c.fileInformerFactory.Start(ctx.Done())
 }