From d04543ffef61e777f71baa9f49b79e2e91b95fd0 Mon Sep 17 00:00:00 2001 From: Simon Westcott Date: Thu, 11 May 2017 12:44:11 +0100 Subject: [PATCH 1/2] Fix context discovery --- completion/kubectx.bash | 4 ++-- completion/kubectx.zsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/completion/kubectx.bash b/completion/kubectx.bash index c51d9c3..8469d2b 100644 --- a/completion/kubectx.bash +++ b/completion/kubectx.bash @@ -2,7 +2,7 @@ _kube_contexts() { local curr_arg; curr_arg=${COMP_WORDS[COMP_CWORD]} - COMPREPLY=( $(compgen -W "- $(kubectl config get-contexts | awk '{print $2}' | tail -n +2)" -- $curr_arg ) ); + COMPREPLY=( $(compgen -W "- $(kubectl config get-contexts --output='name')" -- $curr_arg ) ); } -complete -F _kube_contexts kubectx \ No newline at end of file +complete -F _kube_contexts kubectx diff --git a/completion/kubectx.zsh b/completion/kubectx.zsh index ada6dde..7d3a89c 100644 --- a/completion/kubectx.zsh +++ b/completion/kubectx.zsh @@ -6,7 +6,7 @@ if [ -f "$KUBECTX" ]; then # show '-' only if there's a saved previous context PREV=$(cat "${KUBECTX}") _arguments "1: :((-\:Back\ to\ ${PREV} \ - $(kubectl config get-contexts | awk '{print $2}' | tail -n +2)))" + $(kubectl config get-contexts --output='name')))" else - _arguments "1: :($(kubectl config get-contexts | awk '{print $2}' | tail -n +2))" + _arguments "1: :($(kubectl config get-contexts --output='name'))" fi From 8c6cf84801b7cdbe5bb8d874305461d7cb68644b Mon Sep 17 00:00:00 2001 From: Simon Westcott Date: Fri, 12 May 2017 09:05:02 +0100 Subject: [PATCH 2/2] Unified context discovery --- kubectx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kubectx b/kubectx index 403f61d..8cd4342 100755 --- a/kubectx +++ b/kubectx @@ -40,8 +40,7 @@ current_context() { } get_contexts() { - kubectl config view \ - -o=jsonpath='{range .contexts[*].name}{@}{"\n"}{end}' + kubectl config get-contexts --output=name } list_contexts() {