WIP

Signed-off-by: Rory Z <[email protected]>

main.go

@@ -38,6 +38,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	appsv1beta3 "github.com/emqx/emqx-operator/apis/apps/v1beta3"
 	appsv1beta4 "github.com/emqx/emqx-operator/apis/apps/v1beta4"
 	appsv2alpha1 "github.com/emqx/emqx-operator/apis/apps/v2alpha1"
@@ -103,7 +105,9 @@ func main() {
 		LeaderElectionID:       "19fd6fcc.emqx.io",
 		LeaseDuration:          ptr.To(time.Second * 30),
 		RenewDeadline:          ptr.To(time.Second * 20),
-		Cache:                  getCacheOptions(),
+		Cache: cache.Options{
+			DefaultNamespaces: getWatchNamespace(),
+		},
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")
@@ -176,26 +180,17 @@ func main() {
 	}
 }
 
-func getCacheOptions() cache.Options {
+// getWatchNamespace returns the Namespace the operator should be watching for changes
+func getWatchNamespace() map[string]cache.Config {
 	var watchNamespaceEnvVar = "WATCH_NAMESPACE"
 
 	ns, found := os.LookupEnv(watchNamespaceEnvVar)
 	if !found {
-		return cache.Options{}
+		return map[string]cache.Config{
+			metav1.NamespaceAll: {},
+		}
 	}
-
-	return cache.Options{
-		DefaultNamespaces: map[string]cache.Config{ns: {}},
+	return map[string]cache.Config{
+		ns: {},
 	}
 }
-
-// getWatchNamespace returns the Namespace the operator should be watching for changes
-// func getWatchNamespace() string {
-// 	var watchNamespaceEnvVar = "WATCH_NAMESPACE"
-
-// 	ns, found := os.LookupEnv(watchNamespaceEnvVar)
-// 	if !found {
-// 		return metav1.NamespaceAll
-// 	}
-// 	return ns
-// }