From eeebaf5c6307b0da7a2face748be1f3638e8c70c Mon Sep 17 00:00:00 2001 From: hophacker Date: Tue, 20 Oct 2020 13:28:38 +0800 Subject: [PATCH] changes --- zsh/aliases.zsh | 1 + zsh/functions.zsh | 10 +++++----- zsh/prezto-themes/prompt_skwp_setup | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 85cbf57..bcf409f 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -260,3 +260,4 @@ alias edit_alias="vim $yadr_zsh/aliases.zsh $yadr_zsh/functions.zsh -p" alias docker_purge='docker stop $(docker ps -qa);docker rm $(docker ps -qa)' alias yarn_sass="SASS_BINARY_SITE=https://npm.taobao.org/mirrors/node-sass/ yarn" alias vim="nvim" +alias k="kubectl" diff --git a/zsh/functions.zsh b/zsh/functions.zsh index cfa3032..6bc4c43 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -298,7 +298,7 @@ function helm() { command helm $finalopts --kubeconfig=$HOME/.kube/${KCONTEXT}_config } function kexec { - RAN=false + RAN=true NAMESPACE=default finalopts=() while [[ $@ != "" ]] do @@ -307,8 +307,8 @@ function kexec { KCONTEXT="${i#*=}" shift ;; - -r) - RAN=true + -R) + RAN=false shift ;; -p) @@ -373,8 +373,8 @@ function kexec { fi done if [[ $RUNNING_POD_INDEX != -1 ]]; then - echo "kubectl exec -it $RUNNING_PODS[$RUNNING_POD_INDEX] $finalopts" - kubectl -n $NAMESPACE exec -it $RUNNING_PODS[$RUNNING_POD_INDEX] $finalopts + echo "kubectl -it -n $NAMESPACE exec $RUNNING_PODS[$RUNNING_POD_INDEX] -- $finalopts" + kubectl -it -n $NAMESPACE exec $RUNNING_PODS[$RUNNING_POD_INDEX] -- $finalopts fi } diff --git a/zsh/prezto-themes/prompt_skwp_setup b/zsh/prezto-themes/prompt_skwp_setup index cf6e72e..e2b7b1d 100644 --- a/zsh/prezto-themes/prompt_skwp_setup +++ b/zsh/prezto-themes/prompt_skwp_setup @@ -86,4 +86,3 @@ function set_k8s_context { export KCONTEXT=$C prompt_skwp_setup } -prompt_skwp_setup "$@"