github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix last current-context command in cluster/common.sh

pull/6/head
Jeff Lowdermilk 2015-11-02 14:05:33 -08:00
parent a963a05af4
commit d55666043b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/common.sh
View File

@ -115,9 +115,8 @@ function clear-kubeconfig() {
"${kubectl}" config unset "users.${CONTEXT}-basic-auth" "${kubectl}" config unset "users.${CONTEXT}-basic-auth"
"${kubectl}" config unset "contexts.${CONTEXT}" "${kubectl}" config unset "contexts.${CONTEXT}"
local current local cc=$("${kubectl}" config view -o jsonpath='{.current-context}')
current=$("${kubectl}" config view -o jsonpath='{.current-context}') if [[ "${cc}" == "${CONTEXT}" ]]; then
if [[ "${current}" == "${CONTEXT}" ]]; then
"${kubectl}" config unset current-context "${kubectl}" config unset current-context
fi fi
@ -147,7 +146,7 @@ function tear_down_alive_resources() {
function get-kubeconfig-basicauth() { function get-kubeconfig-basicauth() {
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG} export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
local cc="current-context" local cc=$("${KUBE_ROOT}/cluster/kubectl.sh" config view -o jsonpath="{.current-context}")
if [[ ! -z "${KUBE_CONTEXT:-}" ]]; then if [[ ! -z "${KUBE_CONTEXT:-}" ]]; then
cc="${KUBE_CONTEXT}" cc="${KUBE_CONTEXT}"
fi fi