github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Teach kubectl to avoid local/util, since its gone.

Browse Source
This commit is contained in:
Prashanth Balasubramanian 2015-02-16 19:41:54 -08:00
parent 49b92d43b6
commit 6fb36dc0bc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/kubectl.sh
View File

@ -20,7 +20,10 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" UTILS=${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh
if [ -f ${UTILS} ]; then
source "${UTILS}"
fi
# Get the absolute path of the directory component of a file, i.e. the # Get the absolute path of the directory component of a file, i.e. the
# absolute path of the dirname of $1. # absolute path of the dirname of $1.
@ -116,7 +119,7 @@ elif [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then
# When we are using vagrant it has hard coded kubeconfig, and do not clobber public endpoints # When we are using vagrant it has hard coded kubeconfig, and do not clobber public endpoints
config=( config=(
"--kubeconfig=$HOME/.kubernetes_vagrant_kubeconfig" "--kubeconfig=$HOME/.kubernetes_vagrant_kubeconfig"
) )
fi fi
echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2 echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2