From 282bc633ba32516788cacf6a546a483618a6e1dc Mon Sep 17 00:00:00 2001 From: kdebacker Date: Tue, 28 Jan 2020 10:34:03 +0100 Subject: [PATCH] quick fix for klog kfor --- fubectl.source | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fubectl.source b/fubectl.source index 2a12ca1..d26012f 100755 --- a/fubectl.source +++ b/fubectl.source @@ -121,10 +121,12 @@ klog() { fi local arg_pair=$(kubectl get po --all-namespaces | _inline_fzf | awk '{print $1, $2}') + local ns=$(echo $arg_pair | awk '{print $1}') + local pod=$(echo $arg_pair | awk '{print $2}') [ -z "$arg_pair" ] && printf "klog: no pods found. no logs can be shown.\n" && return local containers_out=$(echo "$arg_pair" | xargs kubectl get po -o=jsonpath='{.spec.containers[*].name} {.spec.initContainers[*].name}' -n | sed 's/ $//') local container_choosen=$(echo "$containers_out" | tr ' ' "\n" | _inline_fzf_nh) - kubectl logs -n ${arg_pair} -c "${container_choosen}" --tail="${line_count}" "$@" + kubectl logs -n ${ns} -c "${container_choosen}" --tail="${line_count}" "$@" ${pod} } # [kex] execute command in container @@ -142,9 +144,11 @@ kfor() { local port="$1" [ -z "$port" ] && printf "kfor: missing argument.\nUsage: kfor PORT_TO_FORWARD\n" && return 255 local arg_pair="$(kubectl get po --all-namespaces | _inline_fzf | awk '{print $1, $2}')" + local ns=$(echo $arg_pair | awk '{print $1}') + local pod=$(echo $arg_pair | awk '{print $2}') [ -z "$arg_pair" ] && printf "kfor: no pods found. no forwarding.\n" && return echo "kubectl port-forward -n $arg_pair $port" - kubectl port-forward -n $arg_pair "$port" + kubectl port-forward -n $ns $pod "$port" } # [ksearch] search for string in resources