layer1: centralize managed namespace labels step 13

pkg/buildermgr/ns_watcher.go

@@ -20,8 +20,6 @@ import (
 	"github.com/fission/fission/pkg/utils/manager"
 )
 
-const builderManagedNSLabel = "fission.io/managed"
-
 // StartNSWatcher watches for Namespaces labeled fission.io/managed=true
 // and immediately registers per-NS informers in envWatcher and pkgWatcher.
 func StartNSWatcher(
@@ -36,7 +34,7 @@ func StartNSWatcher(
 		kubeClient,
 		30*time.Minute,
 		k8sInformers.WithTweakListOptions(func(opts *metav1.ListOptions) {
-			opts.LabelSelector = builderManagedNSLabel + "=true"
+			opts.LabelSelector = utils.ManagedNamespaceLabelSelector()
 		}),
 	)
 
@@ -54,7 +52,7 @@ func StartNSWatcher(
 		},
 		UpdateFunc: func(_, newObj interface{}) {
 			nsObj, ok := newObj.(*corev1.Namespace)
-			if !ok || nsObj.Labels[builderManagedNSLabel] != "true" {
+			if !ok || !utils.IsManagedNamespace(nsObj.Labels) {
 				return
 			}
 			utils.DefaultNSResolver().AddNamespace(nsObj.Name)
@@ -65,7 +63,7 @@ func StartNSWatcher(
 
 	mgr.Add(ctx, func(ctx context.Context) {
 		logger.Info("buildermgr.NSWatcher: started",
-			zap.String("label", builderManagedNSLabel+"=true"))
+			zap.String("label", utils.ManagedNamespaceLabelSelector()))
 		factory.Start(ctx.Done())
 		factory.WaitForCacheSync(ctx.Done())
 		logger.Info("buildermgr.NSWatcher: cache synced — watching for new namespaces")