Merge pull request grafana#423 from pb82/fix-watch-namespace

fix: add watch namespace back to mgr

main.go

@@ -110,8 +110,15 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
+	namespace, err := k8sutil.GetWatchNamespace()
+	if err != nil {
+		log.Log.Error(err, "failed to get watch namespace")
+		os.Exit(1)
+	}
+
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
+		Namespace:              namespace,
 		MetricsBindAddress:     metricsAddr,
 		Port:                   9443,
 		HealthProbeBindAddress: probeAddr,
@@ -122,11 +129,6 @@ func main() {
 		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)
 	}
-	namespace, err := k8sutil.GetWatchNamespace()
-	if err != nil {
-		log.Log.Error(err, "failed to get watch namespace")
-		os.Exit(1)
-	}
 
 	if scanAll && flagNamespaces != "" {
 		fmt.Fprint(os.Stderr, "--scan-all and --namespaces both set. Please provide only one")