diff --git a/e2e/e2e.sh b/e2e/e2e.sh
index 1413e89e..9bc7d1cf 100755
--- a/e2e/e2e.sh
+++ b/e2e/e2e.sh
@@ -2,7 +2,7 @@
 set -o errexit
 set -x
 # Get Kind
-go install sigs.k8s.io/kind@v0.17.0
+go install sigs.k8s.io/kind@v0.21.0
 # minio statefulset name
 MINIO_STS_NAME=myminio-ss-0
 # druid namespace
@@ -45,7 +45,7 @@ kubectl apply -f e2e/configs/druid-cr.yaml -n ${NAMESPACE}
 sleep 10
 for d in $(kubectl get pods -n ${NAMESPACE} -l app=druid -l druid_cr=tiny-cluster -o name)
 do
-  kubectl wait -n ${NAMESPACE} "$d" --for=condition=Ready --timeout=5m
+  kubectl wait -n ${NAMESPACE} "$d" --for=condition=Ready --timeout=15m
 done
 # wait for druid pods
 for s in $(kubectl get sts -n ${NAMESPACE} -l app=${NAMESPACE} -l druid_cr=tiny-cluster -o name)
diff --git a/main.go b/main.go
index e0861689..7b375da1 100644
--- a/main.go
+++ b/main.go
@@ -118,8 +118,9 @@ func main() {
 
 func watchNamespaceCache() cache.NewCacheFunc {
 	var managerWatchCache cache.NewCacheFunc
-	if watchNamespace != "" {
-		ns := strings.Split(watchNamespace, ",")
+	ns := strings.Split(watchNamespace, ",")
+
+	if len(ns) > 1 {
 		for i := range ns {
 			ns[i] = strings.TrimSpace(ns[i])
 		}