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

export KUBECONFIG so callers of common.sh functions can use it

pull/6/head
Jeff Lowdermilk 2015-04-17 16:22:07 -07:00
parent 95183dde5a
commit 1c265f3784
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/common.sh
View File

@ -38,7 +38,7 @@ DEFAULT_KUBECONFIG="${HOME}/.kube/config"
function create-kubeconfig() {
local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
# KUBECONFIG determines the file we write to, but it may not exist yet
if [[ ! -e "${KUBECONFIG}" ]]; then
mkdir -p $(dirname "${KUBECONFIG}")
@ -63,7 +63,7 @@ function create-kubeconfig() {
# KUBECONFIG
# CONTEXT
function clear-kubeconfig() {
KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
"${kubectl}" config unset "clusters.${CONTEXT}"
"${kubectl}" config unset "users.${CONTEXT}"
@ -89,7 +89,7 @@ function clear-kubeconfig() {
# KUBE_USER,KUBE_PASSWORD will be empty if no current-context is set, or
# the current-context user does not exist or contain basicauth entries.
function get-kubeconfig-basicauth() {
KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
# Templates to safely extract the username,password for the current-context
# user. The long chain of 'with' commands avoids indexing nil if any of the
# entries ("current-context", "contexts"."current-context", "users", etc)

1
cluster/gce/util.sh
View File

@ -830,7 +830,6 @@ function kube-down {
--quiet \
"${MASTER_NAME}-ip" || true
export KUBECONFIG="${HOME}/.kube/.kubeconfig"
export CONTEXT="${PROJECT}_${INSTANCE_PREFIX}"
clear-kubeconfig
}