Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

layer1: fix managed watcher config wiring

Browse Source
This commit is contained in:
Naeel
2026-04-26 11:02:54 +03:00
parent d2ff55f9e0
commit d24605a8b8
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/executor/multitenant/ns_watcher.go
+6 -7
View File
@@ -71,12 +71,6 @@ import (
"github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils"
"github.com/fission/fission/pkg/utils/manager" "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 // StartNSWatcher registers a Kubernetes Namespace Informer that reacts immediately
// when a Namespace with label fission.io/managed=true is created or relabeled. // 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, executorTypes map[fv1.ExecutorType]executortype.ExecutorType,
mgr manager.Interface, 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 { if err != nil {
logger.Error("multitenant.NSWatcher: BootstrapAndDispatch failed", zap.Error(err)) logger.Error("multitenant.NSWatcher: BootstrapAndDispatch failed", zap.Error(err))
} }
pkg/router/ns_watcher.go
+6 -7
View File
@@ -14,12 +14,6 @@ import (
"github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils"
"github.com/fission/fission/pkg/utils/manager" "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. // StartNSWatcher registers a Kubernetes Namespace Informer for the router.
// Whenever a Namespace with label fission.io/managed=true appears (or is relabeled), // Whenever a Namespace with label fission.io/managed=true appears (or is relabeled),
// the router immediately subscribes to HTTPTriggers and Functions in that namespace. // the router immediately subscribes to HTTPTriggers and Functions in that namespace.
@@ -30,7 +24,12 @@ func StartNSWatcher(
ts *HTTPTriggerSet, ts *HTTPTriggerSet,
mgr manager.Interface, 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 { if err != nil {
logger.Error("router.NSWatcher: BootstrapAndDispatch failed", zap.Error(err)) logger.Error("router.NSWatcher: BootstrapAndDispatch failed", zap.Error(err))
} }