Make sure the namespaces are correctly set so the informers are names…

…paced.

.vscode/launch.json

@@ -10,7 +10,10 @@
             "request": "launch",
             "mode": "debug",
             "program": "./main.go",
-            "args": ["wait-multi", "service,model", "service,model2", "model-6fd69c9d97-hrxt5"]
+            "args": [
+                "--kubeconfig=kubeconfig.txt",                
+                "default,service,model",
+            ]
         }
-    }
+    ]    
 }

cmd/wait.go

@@ -24,6 +24,7 @@ import (
 	"sync"
 
 	"github.com/erayan/k8s-wait-for-multi/pkg"
+	"github.com/erayan/k8s-wait-for-multi/utils"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 
@@ -84,8 +85,29 @@ func wait(cmd *cobra.Command, args []string) error {
 	timeoutCtx, cancelFn = context.WithTimeout(context.Background(), timeout)
 	defer cancelFn()
 
+	namespaces := []string{}
+
+	for _, arg := range args {
+		arg_items := strings.Split(arg, ",")
+		len := len(arg_items)
+		err = nil
+		if len == 1 || len == 2 {
+			if !utils.StringInSlice(*KubernetesConfigFlags.Namespace, namespaces) {
+				namespaces = append(namespaces, *KubernetesConfigFlags.Namespace)
+			}
+		} else if len == 3 {
+			if !utils.StringInSlice(arg_items[0], namespaces) {
+				namespaces = append(namespaces, arg_items[0])
+			}
+		} else {
+			log.Printf("illegal argument '%s'", arg)
+		}
+	}
+
+	log.Printf("Starting with namespaces: %v", namespaces)
+
 	opts := cache.Options{
-		Namespaces: waits.GetAllNamespaces(),
+		Namespaces: namespaces,
 	}
 
 	conf, err := KubernetesConfigFlags.ToRESTConfig()

pkg/utils.go

@@ -26,15 +26,6 @@ const (
 
 type TreeStatus string
 
-func stringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
 func metaInSlice(a treeprint.MetaValue, list []treeprint.MetaValue) bool {
 	for _, b := range list {
 		if b == a {

pkg/waitables.go

@@ -21,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/erayan/k8s-wait-for-multi/pkg/items"
+	"github.com/erayan/k8s-wait-for-multi/utils"
 	"github.com/xlab/treeprint"
 
 	batchv1 "k8s.io/api/batch/v1"
@@ -261,18 +262,18 @@ func (w *Waitables) GetAllNamespaces() []string {
 	namespaces := []string{}
 
 	for ns := range w.Services {
-		if !stringInSlice(ns, namespaces) {
+		if !utils.StringInSlice(ns, namespaces) {
 			namespaces = append(namespaces, ns)
 		}
 	}
 
 	for ns := range w.Jobs {
-		if !stringInSlice(ns, namespaces) {
+		if !utils.StringInSlice(ns, namespaces) {
 			namespaces = append(namespaces, ns)
 		}
 	}
 	for ns := range w.Pods {
-		if !stringInSlice(ns, namespaces) {
+		if !utils.StringInSlice(ns, namespaces) {
 			namespaces = append(namespaces, ns)
 		}
 	}

utils/strings.go

@@ -0,0 +1,10 @@
+package utils
+
+func StringInSlice(a string, list []string) bool {
+	for _, b := range list {
+		if b == a {
+			return true
+		}
+	}
+	return false
+}