diff --git a/docs/devel/kubectl-conventions.md b/docs/devel/kubectl-conventions.md index 8705d285610..3e7e88033e8 100644 --- a/docs/devel/kubectl-conventions.md +++ b/docs/devel/kubectl-conventions.md @@ -142,6 +142,7 @@ list when adding new short flags * `-f`: Resource file * also used for `--follow` in `logs`, but should be deprecated in favor of `-F` + * `-n`: Namespace scope * `-l`: Label selector * also used for `--labels` in `expose`, but should be deprecated * `-L`: Label columns diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh index 6ccad41da67..54eb0854d58 100755 --- a/hack/make-rules/test-cmd.sh +++ b/hack/make-rules/test-cmd.sh @@ -1399,6 +1399,8 @@ __EOF__ kubectl create "${kube_flags[@]}" --namespace=other -f docs/admin/limitrange/valid-pod.yaml # Post-condition: valid-pod POD is created kube::test::get_object_assert 'pods --namespace=other' "{{range.items}}{{$id_field}}:{{end}}" 'valid-pod:' + # Post-condition: verify shorthand `-n other` has the same results as `--namespace=other` + kube::test::get_object_assert 'pods -n other' "{{range.items}}{{$id_field}}:{{end}}" 'valid-pod:' ### Delete POD valid-pod in specific namespace # Pre-condition: valid-pod POD exists diff --git a/pkg/client/unversioned/clientcmd/overrides.go b/pkg/client/unversioned/clientcmd/overrides.go index 40a35e65d6c..afb8e716995 100644 --- a/pkg/client/unversioned/clientcmd/overrides.go +++ b/pkg/client/unversioned/clientcmd/overrides.go @@ -158,7 +158,7 @@ func RecommendedContextOverrideFlags(prefix string) ContextOverrideFlags { return ContextOverrideFlags{ ClusterName: FlagInfo{prefix + FlagClusterName, "", "", "The name of the kubeconfig cluster to use"}, AuthInfoName: FlagInfo{prefix + FlagAuthInfoName, "", "", "The name of the kubeconfig user to use"}, - Namespace: FlagInfo{prefix + FlagNamespace, "", "", "If present, the namespace scope for this CLI request"}, + Namespace: FlagInfo{prefix + FlagNamespace, "n", "", "If present, the namespace scope for this CLI request"}, } }