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

layer1: hook router watcher to namespace manager

Browse Source
This commit is contained in:
Naeel
2026-04-26 10:34:04 +03:00
parent b12a8e5e75
commit 0135a93a30
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/ns_watcher.go
+12 -7
View File
@@ -30,6 +30,9 @@ func StartNSWatcher(
ts *HTTPTriggerSet,
mgr manager.Interface,
) {
nsManager := utils.NewBootstrappedNamespaceManager(utils.DefaultNSResolver(), utils.NamespaceSourceEnv, time.Now().UTC())
nsManager.Subscribe(NewNamespaceSubscriber(ts, mgr))
factory := k8sInformers.NewSharedInformerFactoryWithOptions(
kubeClient,
30*time.Minute,
@@ -42,13 +45,14 @@ func StartNSWatcher(
_, _ = nsInformer.AddEventHandler(k8sCache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) {
ns := routerNSName(obj)
if ns == "" {
nsObj, ok := obj.(*corev1.Namespace)
if !ok || nsObj.Name == "" {
return
}
if err := registerRouterNamespace(ctx, ns, ts, mgr); err != nil {
logger.Error("router.NSWatcher: AddNamespace failed",
zap.String("namespace", ns), zap.Error(err))
nsManager.Upsert(utils.NamespaceEventFromNamespace(utils.NamespaceEventAdd, nsObj, utils.NamespaceSourceWatcher, time.Now().UTC()))
if _, _, err := nsManager.DispatchAdd(ctx, nsObj.Name); err != nil {
logger.Error("router.NSWatcher: DispatchAdd failed",
zap.String("namespace", nsObj.Name), zap.Error(err))
}
},
UpdateFunc: func(_, newObj interface{}) {
@@ -56,8 +60,9 @@ func StartNSWatcher(
if !ok || !utils.IsManagedNamespace(nsObj.Labels) {
return
}
if err := registerRouterNamespace(ctx, nsObj.Name, ts, mgr); err != nil {
logger.Error("router.NSWatcher: AddNamespace failed",
nsManager.Upsert(utils.NamespaceEventFromNamespace(utils.NamespaceEventUpdate, nsObj, utils.NamespaceSourceWatcher, time.Now().UTC()))
if _, _, err := nsManager.DispatchResync(ctx, nsObj.Name); err != nil {
logger.Error("router.NSWatcher: DispatchResync failed",
zap.String("namespace", nsObj.Name), zap.Error(err))
}
},