Pass cancellable context to newInterfaceDiscovery

Allow interface discovery subscription to be cancelled by passing
signal handler context instead of using context.Background().

Signed-off-by: Andrew McDermott <[email protected]>

Author: frobware

cmd/bpfman-agent/main.go

@@ -100,12 +100,11 @@ type interfaceDiscovery struct {
 // method to process events.
 //
 // Returns an error if the subscription to interface events fails.
-func newInterfaceDiscovery(interfaces *sync.Map) (*interfaceDiscovery, error) {
+func newInterfaceDiscovery(ctx context.Context, interfaces *sync.Map) (*interfaceDiscovery, error) {
 	informer := ifaces.NewWatcher(buffersLength)
 	registerer := ifaces.NewRegisterer(informer, buffersLength)
 
-	setupCtx := context.Background()
-	ifaceEvents, err := registerer.Subscribe(setupCtx)
+	ifaceEvents, err := registerer.Subscribe(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("subscribing to interface events: %w", err)
 	}
@@ -424,17 +423,19 @@ func main() {
 		os.Exit(1)
 	}
 
+	ctx := ctrl.SetupSignalHandler()
+
 	var ifaceDiscovery *interfaceDiscovery
 	if enableInterfacesDiscovery {
-		ifaceDiscovery, err = newInterfaceDiscovery(commonApp.Interfaces)
+		ifaceDiscovery, err = newInterfaceDiscovery(ctx, commonApp.Interfaces)
 		if err != nil {
 			setupLog.Error(err, "failed to set up interface discovery")
 			os.Exit(1)
 		}
 	}
 
 	setupLog.Info("starting Bpfman-Agent")
-	if err := runAgent(ctrl.SetupSignalHandler(), mgr, metricsServer, ifaceDiscovery, ctrl.Log.WithName("agent")); err != nil {
+	if err := runAgent(ctx, mgr, metricsServer, ifaceDiscovery, ctrl.Log.WithName("agent")); err != nil {
 		setupLog.Error(err, "agent runtime failed, exiting")
 		os.Exit(1)
 	}