From d24605a8b8d6bd9eefcdee43063fedb4a8fb1f43 Mon Sep 17 00:00:00 2001 From: Naeel Date: Sun, 26 Apr 2026 11:02:54 +0300 Subject: [PATCH] layer1: fix managed watcher config wiring --- pkg/executor/multitenant/ns_watcher.go | 13 ++++++------- pkg/router/ns_watcher.go | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkg/executor/multitenant/ns_watcher.go b/pkg/executor/multitenant/ns_watcher.go index 617933bf..dfde458e 100644 --- a/pkg/executor/multitenant/ns_watcher.go +++ b/pkg/executor/multitenant/ns_watcher.go @@ -71,12 +71,6 @@ import ( "github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils/manager" ) - _, err := utils.RunManagedNamespaceWatcher(ctx, logger, kubernetesClient, mgr, utils.ManagedNamespaceWatcherConfig{ - Component: "multitenant.NSWatcher", - Namespaces: utils.DefaultNSResolver().Snapshot(), - RemovalStrategy: utils.NamespaceRemovalStrategyTrackOnly, - Subscriber: NewNamespaceSubscriber(logger, kubernetesClient, executorTypes, mgr), - }) // StartNSWatcher registers a Kubernetes Namespace Informer that reacts immediately // when a Namespace with label fission.io/managed=true is created or relabeled. // @@ -92,7 +86,12 @@ func StartNSWatcher( executorTypes map[fv1.ExecutorType]executortype.ExecutorType, mgr manager.Interface, ) { - _, err := utils.RunManagedNamespaceWatcher(ctx, logger, "multitenant.NSWatcher", kubernetesClient, mgr, utils.DefaultNSResolver().Snapshot(), utils.NamespaceRemovalStrategyTrackOnly, NewNamespaceSubscriber(logger, kubernetesClient, executorTypes, mgr)) + _, err := utils.RunManagedNamespaceWatcher(ctx, logger, kubernetesClient, mgr, utils.ManagedNamespaceWatcherConfig{ + Component: "multitenant.NSWatcher", + Namespaces: utils.DefaultNSResolver().Snapshot(), + RemovalStrategy: utils.NamespaceRemovalStrategyTrackOnly, + Subscriber: NewNamespaceSubscriber(logger, kubernetesClient, executorTypes, mgr), + }) if err != nil { logger.Error("multitenant.NSWatcher: BootstrapAndDispatch failed", zap.Error(err)) } diff --git a/pkg/router/ns_watcher.go b/pkg/router/ns_watcher.go index 82e91dfe..e8669219 100644 --- a/pkg/router/ns_watcher.go +++ b/pkg/router/ns_watcher.go @@ -14,12 +14,6 @@ import ( "github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils/manager" ) - _, err := utils.RunManagedNamespaceWatcher(ctx, logger, kubeClient, mgr, utils.ManagedNamespaceWatcherConfig{ - Component: "router.NSWatcher", - Namespaces: utils.DefaultNSResolver().Snapshot(), - RemovalStrategy: utils.NamespaceRemovalStrategyTrackOnly, - Subscriber: NewNamespaceSubscriber(ts, mgr), - }) // StartNSWatcher registers a Kubernetes Namespace Informer for the router. // Whenever a Namespace with label fission.io/managed=true appears (or is relabeled), // the router immediately subscribes to HTTPTriggers and Functions in that namespace. @@ -30,7 +24,12 @@ func StartNSWatcher( ts *HTTPTriggerSet, mgr manager.Interface, ) { - _, err := utils.RunManagedNamespaceWatcher(ctx, logger, "router.NSWatcher", kubeClient, mgr, utils.DefaultNSResolver().Snapshot(), utils.NamespaceRemovalStrategyTrackOnly, NewNamespaceSubscriber(ts, mgr)) + _, err := utils.RunManagedNamespaceWatcher(ctx, logger, kubeClient, mgr, utils.ManagedNamespaceWatcherConfig{ + Component: "router.NSWatcher", + Namespaces: utils.DefaultNSResolver().Snapshot(), + RemovalStrategy: utils.NamespaceRemovalStrategyTrackOnly, + Subscriber: NewNamespaceSubscriber(ts, mgr), + }) if err != nil { logger.Error("router.NSWatcher: BootstrapAndDispatch failed", zap.Error(err)) }