Handle AddEventHandler error.

The `AddEventHandler` interface has changed and now returns an error (and a registration object that we do not need to use for now). This handles the error if any arise and also makes the linter happy :). Signed-off-by: Vincent Demeester <[email protected]>
tektoncd · Jul 28, 2023 · 9f056cd · 9f056cd
1 parent 4b8c9a1
commit 9f056cd
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 43 deletions.
diff --git a/go.mod b/go.mod
@@ -40,10 +40,10 @@ require (
 
 //  TODO: Remove this once https://github.com/knative/pkg/issues/2759 is fixed
 replace (
-	k8s.io/api => k8s.io/api v0.26.5
-	k8s.io/apimachinery => k8s.io/apimachinery v0.26.5
-	k8s.io/client-go => k8s.io/client-go v0.26.5
-	k8s.io/code-generator => k8s.io/code-generator v0.26.5
+	k8s.io/api => k8s.io/api v0.26.7
+	k8s.io/apimachinery => k8s.io/apimachinery v0.26.7
+	k8s.io/client-go => k8s.io/client-go v0.26.7
+	k8s.io/code-generator => k8s.io/code-generator v0.26.7
 )
 
 require github.com/benbjohnson/clock v1.1.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/pkg/reconciler/notifications/customrun/controller.go b/pkg/reconciler/notifications/customrun/controller.go
@@ -52,7 +52,9 @@ func NewController() func(context.Context, configmap.Watcher) *controller.Impl {
 			}
 		})
 
-		customRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue))
+		if _, err := customRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register CustomRun informer event handler: %w", err)
+		}
 
 		return impl
 	}

diff --git a/pkg/reconciler/pipelinerun/controller.go b/pkg/reconciler/pipelinerun/controller.go
@@ -79,20 +79,30 @@ func NewController(opts *pipeline.Options, clock clock.PassiveClock, tracerProvi
 			}
 		})
 
-		pipelineRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue))
+		if _, err := pipelineRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register PipelineRun informer event handler: %w", err)
+		}
 
-		taskRunInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
+		if _, err := taskRunInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 			FilterFunc: controller.FilterController(&v1.PipelineRun{}),
 			Handler:    controller.HandleAll(impl.EnqueueControllerOf),
-		})
-		customRunInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
+		}); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register TaskRun informer event handler: %w", err)
+		}
+
+		if _, err := customRunInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 			FilterFunc: controller.FilterController(&v1.PipelineRun{}),
 			Handler:    controller.HandleAll(impl.EnqueueControllerOf),
-		})
-		resolutionInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
+		}); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register CustomRun informer event handler: %w", err)
+		}
+
+		if _, err := resolutionInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 			FilterFunc: controller.FilterController(&v1.PipelineRun{}),
 			Handler:    controller.HandleAll(impl.EnqueueControllerOf),
-		})
+		}); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register ResolutionRequest informer event handler: %w", err)
+		}
 
 		return impl
 	}

diff --git a/pkg/reconciler/resolutionrequest/controller.go b/pkg/reconciler/resolutionrequest/controller.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/utils/clock"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
+	"knative.dev/pkg/logging"
 )
 
 // NewController returns a func that returns a knative controller for processing
@@ -36,7 +37,9 @@ func NewController(clock clock.PassiveClock) func(ctx context.Context, cmw confi
 		impl := resolutionrequestreconciler.NewImpl(ctx, r)
 
 		reqinformer := resolutionrequestinformer.Get(ctx)
-		reqinformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue))
+		if _, err := reqinformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register ResolutionRequest informer event handler: %w", err)
+		}
 
 		return impl
 	}

diff --git a/pkg/reconciler/taskrun/controller.go b/pkg/reconciler/taskrun/controller.go
@@ -89,12 +89,16 @@ func NewController(opts *pipeline.Options, clock clock.PassiveClock, tracerProvi
 			}
 		})
 
-		taskRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue))
+		if _, err := taskRunInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue)); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register TaskRun informer event handler: %w", err)
+		}
 
-		podInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
+		if _, err := podInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 			FilterFunc: controller.FilterController(&v1.TaskRun{}),
 			Handler:    controller.HandleAll(impl.EnqueueControllerOf),
-		})
+		}); err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register Pod informer event handler: %w", err)
+		}
 
 		return impl
 	}

diff --git a/pkg/resolution/resolver/framework/controller.go b/pkg/resolution/resolver/framework/controller.go
@@ -81,7 +81,7 @@ func NewController(ctx context.Context, resolver Resolver, modifiers ...Reconcil
 			Logger:        logger,
 		})
 
-		rrInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
+		_, err := rrInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 			FilterFunc: filterResolutionRequestsBySelector(resolver.GetSelector(ctx)),
 			Handler: cache.ResourceEventHandlerFuncs{
 				AddFunc: impl.Enqueue,
@@ -93,6 +93,9 @@ func NewController(ctx context.Context, resolver Resolver, modifiers ...Reconcil
 				// DeleteFunc: impl.Enqueue,
 			},
 		})
+		if err != nil {
+			logging.FromContext(ctx).Panicf("Couldn't register ResolutionRequest informer event handler: %w", err)
+		}
 
 		return impl
 	}

diff --git a/test/custom-task-ctrls/wait-task-beta/cmd/controller/main.go b/test/custom-task-ctrls/wait-task-beta/cmd/controller/main.go
@@ -28,6 +28,7 @@ import (
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/injection/sharedmain"
+	"knative.dev/pkg/logging"
 )
 
 const controllerName = "wait-task-controller"
@@ -46,10 +47,12 @@ func newController(ctx context.Context, cmw configmap.Watcher) *controller.Impl
 		}
 	})
 
-	customruninformer.Get(ctx).Informer().AddEventHandler(cache.FilteringResourceEventHandler{
+	if _, err := customruninformer.Get(ctx).Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 		FilterFunc: tkncontroller.FilterCustomRunRef("wait.testing.tekton.dev/v1beta1", "Wait"),
 		Handler:    controller.HandleAll(impl.Enqueue),
-	})
+	}); err != nil {
+		logging.FromContext(ctx).Panicf("Couldn't register CustomRun informer event handler: %w", err)
+	}
 
 	return impl
 }
diff --git a/test/custom-task-ctrls/wait-task-beta/go.mod b/test/custom-task-ctrls/wait-task-beta/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/tektoncd/pipeline v0.49.0
 	k8s.io/api v0.26.7
 	k8s.io/apimachinery v0.26.7
-	k8s.io/client-go v0.25.11
+	k8s.io/client-go v0.26.7
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
 	knative.dev/pkg v0.0.0-20230221145627-8efb3485adcf
 )
diff --git a/test/custom-task-ctrls/wait-task-beta/go.sum b/test/custom-task-ctrls/wait-task-beta/go.sum
diff --git a/vendor/k8s.io/api/core/v1/types.go b/vendor/k8s.io/api/core/v1/types.go
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go b/vendor/k8s.io/apimachinery/pkg/runtime/converter.go
diff --git a/vendor/k8s.io/client-go/util/cert/cert.go b/vendor/k8s.io/client-go/util/cert/cert.go
diff --git a/vendor/modules.txt b/vendor/modules.txt