From 8350fcbf92472816cd4a819d8330cb8052cdc247 Mon Sep 17 00:00:00 2001 From: Harrison Kiang Date: Wed, 4 Mar 2020 22:55:29 -0600 Subject: [PATCH 1/6] kdecs alias --- plugins/kubectl/kubectl.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh index 92688c53c..4f3904cec 100644 --- a/plugins/kubectl/kubectl.plugin.zsh +++ b/plugins/kubectl/kubectl.plugin.zsh @@ -55,6 +55,7 @@ alias kgswide='kgs -o wide' alias kes='kubectl edit svc' alias kds='kubectl describe svc' alias kdels='kubectl delete svc' +alias kdecs='_check_jq(){ if [ $(jq --version) != "jq-1.6" ]; then echo "kdecs requires jq-1.6 to use the base64d format"; fi; unset -f _check_jq}; _check_jq; _kdecs(){kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; unset -f _kdecs}; _kdecs' # Ingress management alias kgi='kubectl get ingress' From a4a69dbcd27f6dd33c66bcd0cfb5f5fb145928d0 Mon Sep 17 00:00:00 2001 From: Harrison Kiang Date: Wed, 4 Mar 2020 23:15:20 -0600 Subject: [PATCH 2/6] styleguide --- plugins/kubectl/kubectl.plugin.zsh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh index 4f3904cec..7841c0e4d 100644 --- a/plugins/kubectl/kubectl.plugin.zsh +++ b/plugins/kubectl/kubectl.plugin.zsh @@ -55,7 +55,17 @@ alias kgswide='kgs -o wide' alias kes='kubectl edit svc' alias kds='kubectl describe svc' alias kdels='kubectl delete svc' -alias kdecs='_check_jq(){ if [ $(jq --version) != "jq-1.6" ]; then echo "kdecs requires jq-1.6 to use the base64d format"; fi; unset -f _check_jq}; _check_jq; _kdecs(){kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; unset -f _kdecs}; _kdecs' +alias kdecs=' +_kdecs() { + if [ $(jq --version) != "jq-1.6" ]; then + echo "kdecs requires jq-1.6 to use the base64d format"; + return 1 + fi + kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; + unset -f _kdecs + return 0 +}; +_kdecs' # Ingress management alias kgi='kubectl get ingress' From b35b7a75f19ecebff8d77c18cda775a8698e158a Mon Sep 17 00:00:00 2001 From: Harrison Kiang Date: Wed, 4 Mar 2020 23:15:54 -0600 Subject: [PATCH 3/6] move secrets-related alias to secrets section --- plugins/kubectl/kubectl.plugin.zsh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh index 7841c0e4d..b64154b65 100644 --- a/plugins/kubectl/kubectl.plugin.zsh +++ b/plugins/kubectl/kubectl.plugin.zsh @@ -55,17 +55,6 @@ alias kgswide='kgs -o wide' alias kes='kubectl edit svc' alias kds='kubectl describe svc' alias kdels='kubectl delete svc' -alias kdecs=' -_kdecs() { - if [ $(jq --version) != "jq-1.6" ]; then - echo "kdecs requires jq-1.6 to use the base64d format"; - return 1 - fi - kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; - unset -f _kdecs - return 0 -}; -_kdecs' # Ingress management alias kgi='kubectl get ingress' @@ -93,6 +82,17 @@ alias kgsec='kubectl get secret' alias kgseca='kubectl get secret --all-namespaces' alias kdsec='kubectl describe secret' alias kdelsec='kubectl delete secret' +alias kdecs=' +_kdecs() { + if [ $(jq --version) != "jq-1.6" ]; then + echo "kdecs requires jq-1.6 to use the base64d format"; + return 1 + fi + kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; + unset -f _kdecs + return 0 +}; +_kdecs' # Deployment management. alias kgd='kubectl get deployment' From 21bac01e6d6ac996ec1239b57d971f63ce0f391a Mon Sep 17 00:00:00 2001 From: Harrison Kiang Date: Thu, 5 Mar 2020 00:21:49 -0600 Subject: [PATCH 4/6] unset temp func on fail case --- plugins/kubectl/kubectl.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh index b64154b65..e58a33520 100644 --- a/plugins/kubectl/kubectl.plugin.zsh +++ b/plugins/kubectl/kubectl.plugin.zsh @@ -86,6 +86,7 @@ alias kdecs=' _kdecs() { if [ $(jq --version) != "jq-1.6" ]; then echo "kdecs requires jq-1.6 to use the base64d format"; + unset -f _kdecs return 1 fi kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; From ce445772ce2d33a3217debbf06830c14f57de977 Mon Sep 17 00:00:00 2001 From: Harrison Kiang Date: Thu, 5 Mar 2020 21:58:35 -0600 Subject: [PATCH 5/6] change name --- plugins/kubectl/kubectl.plugin.zsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh index e58a33520..7fedc51eb 100644 --- a/plugins/kubectl/kubectl.plugin.zsh +++ b/plugins/kubectl/kubectl.plugin.zsh @@ -82,18 +82,18 @@ alias kgsec='kubectl get secret' alias kgseca='kubectl get secret --all-namespaces' alias kdsec='kubectl describe secret' alias kdelsec='kubectl delete secret' -alias kdecs=' -_kdecs() { +alias kdecsec=' +_kdecsec() { if [ $(jq --version) != "jq-1.6" ]; then - echo "kdecs requires jq-1.6 to use the base64d format"; - unset -f _kdecs + echo "kdecsec requires jq-1.6 to use the base64d format"; + unset -f _kdecsec return 1 fi kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; - unset -f _kdecs + unset -f _kdecsec return 0 }; -_kdecs' +_kdecsec' # Deployment management. alias kgd='kubectl get deployment' From 14f66bc624f1643256c3412ca02add26bdcc951c Mon Sep 17 00:00:00 2001 From: Harrison Kiang Date: Mon, 22 May 2023 12:01:32 -0500 Subject: [PATCH 6/6] remove jq dependency see https://github.com/ohmyzsh/ohmyzsh/pull/8699#issuecomment-1293588083 --- plugins/kubectl/kubectl.plugin.zsh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh index 7fedc51eb..b210f073c 100644 --- a/plugins/kubectl/kubectl.plugin.zsh +++ b/plugins/kubectl/kubectl.plugin.zsh @@ -83,17 +83,9 @@ alias kgseca='kubectl get secret --all-namespaces' alias kdsec='kubectl describe secret' alias kdelsec='kubectl delete secret' alias kdecsec=' -_kdecsec() { - if [ $(jq --version) != "jq-1.6" ]; then - echo "kdecsec requires jq-1.6 to use the base64d format"; - unset -f _kdecsec - return 1 - fi - kubectl get secret "$@" -o json | jq ".data | map_values(. | @base64d )"; - unset -f _kdecsec - return 0 -}; -_kdecsec' +kdecsec_go_template='{{range $k,$v := .data}}{{"### "}}{{$k}}{{"\n"}}{{$v|base64decode}}{{"\n\n"}}{{end}}' +alias kdecsec="kubectl get secret -o go-template='$kdecsec_go_template'" +unset kdecsec_go_template # Deployment management. alias kgd='kubectl get deployment'