From d7497dcd34cbad0cddfd3ac7eaa043e2594c46e0 Mon Sep 17 00:00:00 2001 From: Naeel Date: Sun, 26 Apr 2026 10:40:36 +0300 Subject: [PATCH] layer1: remove old namespace watcher helpers --- .../2026-04-26-namespace-manager-step36.md | 18 ++++++++++++++++++ pkg/buildermgr/ns_watcher.go | 8 -------- pkg/executor/multitenant/ns_watcher.go | 10 ---------- pkg/router/ns_watcher.go | 8 -------- 4 files changed, 18 insertions(+), 26 deletions(-) create mode 100644 doc/thinking/2026-04-26-namespace-manager-step36.md diff --git a/doc/thinking/2026-04-26-namespace-manager-step36.md b/doc/thinking/2026-04-26-namespace-manager-step36.md new file mode 100644 index 00000000..ab70bec6 --- /dev/null +++ b/doc/thinking/2026-04-26-namespace-manager-step36.md @@ -0,0 +1,18 @@ +# 2026-04-26 — NamespaceManager rewrite, step 36 + +## Цель шага + +Убрать мёртвый код после перевода watcher-ов на `NamespaceManager` flow. + +## Что меняем + +1. Удаляем неиспользуемые helper-ы: + - `builderNSName()` + - `routerNSName()` + - `namespaceName()` +2. Убираем ставшие неиспользуемыми imports. + +## Что НЕ меняем + +- не меняем runtime behavior; +- не меняем watcher logic. \ No newline at end of file diff --git a/pkg/buildermgr/ns_watcher.go b/pkg/buildermgr/ns_watcher.go index 2df9b698..d0f22cfd 100644 --- a/pkg/buildermgr/ns_watcher.go +++ b/pkg/buildermgr/ns_watcher.go @@ -101,11 +101,3 @@ func StartNSWatcher( logger.Info("buildermgr.NSWatcher: stopped") }) } - -func builderNSName(obj interface{}) string { - nsObj, ok := obj.(*corev1.Namespace) - if !ok { - return "" - } - return nsObj.Name -} diff --git a/pkg/executor/multitenant/ns_watcher.go b/pkg/executor/multitenant/ns_watcher.go index f9904e80..2a0b4f90 100644 --- a/pkg/executor/multitenant/ns_watcher.go +++ b/pkg/executor/multitenant/ns_watcher.go @@ -66,7 +66,6 @@ import ( "go.uber.org/zap" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sInformers "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" @@ -212,12 +211,3 @@ func registerExecutorTypes( } return joinErr } - -// namespaceName extracts the namespace name from an informer event object. -func namespaceName(obj interface{}) string { - accessor, err := meta.Accessor(obj) - if err != nil { - return "" - } - return accessor.GetName() -} diff --git a/pkg/router/ns_watcher.go b/pkg/router/ns_watcher.go index 154ba451..94506b15 100644 --- a/pkg/router/ns_watcher.go +++ b/pkg/router/ns_watcher.go @@ -101,11 +101,3 @@ func StartNSWatcher( logger.Info("router.NSWatcher: stopped") }) } - -func routerNSName(obj interface{}) string { - nsObj, ok := obj.(*corev1.Namespace) - if !ok { - return "" - } - return nsObj.Name -}