From 346399d35f8545a740588eec924e023bd2d87d30 Mon Sep 17 00:00:00 2001 From: Naeel Date: Sun, 26 Apr 2026 10:29:43 +0300 Subject: [PATCH] layer1: align router watcher flow step 23 --- .../2026-04-26-namespace-manager-step23.md | 15 +++++++++++++++ pkg/router/ns_watcher.go | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 doc/thinking/2026-04-26-namespace-manager-step23.md diff --git a/doc/thinking/2026-04-26-namespace-manager-step23.md b/doc/thinking/2026-04-26-namespace-manager-step23.md new file mode 100644 index 00000000..a537ff51 --- /dev/null +++ b/doc/thinking/2026-04-26-namespace-manager-step23.md @@ -0,0 +1,15 @@ +# 2026-04-26 — NamespaceManager rewrite, step 23 + +## Цель шага + +Свести текущий watcher flow и новый subscriber flow `router` к одному helper. + +## Что меняем + +1. `router/ns_watcher.go` больше не дублирует add/resync логику. +2. Watcher вызывает `registerRouterNamespace()`. + +## Что НЕ меняем + +- не переключаем `StartNSWatcher()` на `NamespaceManager`; +- не меняем внешний API watcher-а. \ No newline at end of file diff --git a/pkg/router/ns_watcher.go b/pkg/router/ns_watcher.go index 702468c8..49a28452 100644 --- a/pkg/router/ns_watcher.go +++ b/pkg/router/ns_watcher.go @@ -46,7 +46,7 @@ func StartNSWatcher( if ns == "" { return } - if err := ts.AddNamespace(ctx, ns, mgr); err != nil { + if err := registerRouterNamespace(ctx, ns, ts, mgr); err != nil { logger.Error("router.NSWatcher: AddNamespace failed", zap.String("namespace", ns), zap.Error(err)) } @@ -56,7 +56,7 @@ func StartNSWatcher( if !ok || !utils.IsManagedNamespace(nsObj.Labels) { return } - if err := ts.AddNamespace(ctx, nsObj.Name, mgr); err != nil { + if err := registerRouterNamespace(ctx, nsObj.Name, ts, mgr); err != nil { logger.Error("router.NSWatcher: AddNamespace failed", zap.String("namespace", nsObj.Name), zap.Error(err)) }