diff --git a/README.md b/README.md index 770c0e0..f20928e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Flag | Selection --- | --- `-l, --label LABEL-SELECTOR` | match pods based on a [standard label selector](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) `-p, --pod NAME` | match pods by name -`-n, --ns NAMESPACE-NAME` | match pods in the given namespace +`-n, --ns, --namespace NAMESPACE-NAME` | match pods in the given namespace `--svc NAME` | match pods belonging to the given service `--rc NAME` | match pods belonging to the given replication controller `--rs NAME` | match pods belonging to the given replica set diff --git a/cmd/kail/main.go b/cmd/kail/main.go index 0c30fe1..ddbfb8e 100644 --- a/cmd/kail/main.go +++ b/cmd/kail/main.go @@ -37,6 +37,7 @@ var ( flagLabel = kingpin.Flag("label", "label").Short('l').PlaceHolder("SELECTOR").Strings() flagPod = kingpin.Flag("pod", "pod").Short('p').PlaceHolder("NAME").Strings() flagNs = kingpin.Flag("ns", "namespace").Short('n').PlaceHolder("NAME").Strings() + flagNamespace = kingpin.Flag("namespace", "namespace (same as --ns)").PlaceHolder("NAME").Strings() flagIgnoreNs = kingpin.Flag("ignore-ns", "ignore namespace").PlaceHolder("NAME").Default("kube-system").Strings() flagSvc = kingpin.Flag("svc", "service").PlaceHolder("NAME").Strings() flagRc = kingpin.Flag("rc", "replication controller").PlaceHolder("NAME").Strings() @@ -245,8 +246,11 @@ func createDSBuilder() kail.DSBuilder { dsb = dsb.WithNamespace(currentNS) } - if len(*flagNs) > 0 { - dsb = dsb.WithNamespace(*flagNs...) + if len(*flagNs) > 0 || len(*flagNamespace) > 0 { + // Combine both namespace flags + namespaces := append([]string{}, *flagNs...) + namespaces = append(namespaces, *flagNamespace...) + dsb = dsb.WithNamespace(namespaces...) } if len(*flagIgnoreNs) > 0 {