github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16689 from jlowdermilk/cluster-common

Browse Source 
Fix last current-context command in cluster/common.sh
This commit is contained in:
Mike Danese
2015-11-02 14:39:55 -08:00
parent 8fc36e6068 d55666043b
commit 08a7ffb299
1 changed files with 3 additions and 4 deletions
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 "contexts.${CONTEXT}"
local current
current=$("${kubectl}" config view -o jsonpath='{.current-context}')
if [[ "${current}" == "${CONTEXT}" ]]; then
local cc=$("${kubectl}" config view -o jsonpath='{.current-context}')
if [[ "${cc}" == "${CONTEXT}" ]]; then
"${kubectl}" config unset current-context
fi
@@ -147,7 +146,7 @@ function tear_down_alive_resources() {
function get-kubeconfig-basicauth() {
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
cc="${KUBE_CONTEXT}"
fi