layer1: fix buildermgr namespace dedup step 4

pkg/buildermgr/envwatcher.go

@@ -501,9 +501,9 @@ func (envw *environmentWatcher) createBuilderDeployment(ctx context.Context, env
 }
 
 // AddNamespace dynamically registers a new namespace in environmentWatcher.
-// Creates a per-NS Environment informer. Safe to call repeatedly — deduplicates via nsResolver.
+// Creates a per-NS Environment informer. Safe to call repeatedly — deduplicates via env informer map.
 func (envw *environmentWatcher) AddNamespace(ctx context.Context, ns string, mgr manager.Interface) {
-	if !envw.nsResolver.AddNamespace(ns) {
+	if _, exists := envw.envWatchInformer[ns]; exists {
 		return // already registered
 	}
 	envw.logger.Info("buildermgr.envWatcher.AddNamespace: setting up informer", zap.String("namespace", ns))

pkg/buildermgr/ns_watcher.go

@@ -16,6 +16,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	k8sCache "k8s.io/client-go/tools/cache"
 
+	"github.com/fission/fission/pkg/utils"
 	"github.com/fission/fission/pkg/utils/manager"
 )
 
@@ -47,6 +48,7 @@ func StartNSWatcher(
 			if ns == "" {
 				return
 			}
+			utils.DefaultNSResolver().AddNamespace(ns)
 			envw.AddNamespace(ctx, ns, mgr)
 			pkgw.AddNamespace(ctx, ns, mgr)
 		},
@@ -55,6 +57,7 @@ func StartNSWatcher(
 			if !ok || nsObj.Labels[builderManagedNSLabel] != "true" {
 				return
 			}
+			utils.DefaultNSResolver().AddNamespace(nsObj.Name)
 			envw.AddNamespace(ctx, nsObj.Name, mgr)
 			pkgw.AddNamespace(ctx, nsObj.Name, mgr)
 		},

pkg/buildermgr/pkgwatcher.go

@@ -333,9 +333,9 @@ func setInitialBuildStatus(ctx context.Context, fissionClient versioned.Interfac
 }
 
 // AddNamespace dynamically registers a new namespace in packageWatcher.
-// Creates per-NS Package and Pod informers. Safe to call repeatedly.
+// Creates per-NS Package and Pod informers. Safe to call repeatedly — deduplicates via local informer maps.
 func (pkgw *packageWatcher) AddNamespace(ctx context.Context, ns string, mgr manager.Interface) {
-	if !pkgw.nsResolver.AddNamespace(ns) {
+	if _, exists := pkgw.pkgInformer[ns]; exists {
 		return // already registered
 	}
 	pkgw.logger.Info("buildermgr.pkgWatcher.AddNamespace: setting up informers", zap.String("namespace", ns))