scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11794 from mikedanese/revert-revert

Browse Source 
Revert revert of #11379
This commit is contained in:
Mike Danese
2015-07-24 10:20:48 -07:00
parent 8b990263e9 c3fd33a18d
commit 2e1e4f81cb
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/common.sh
View File

@@ -80,7 +80,9 @@ function create-kubeconfig() {
fi fi
"${kubectl}" config set-cluster "${CONTEXT}" "${cluster_args[@]}" "${kubectl}" config set-cluster "${CONTEXT}" "${cluster_args[@]}"
if [[ -n "${user_args[@]:-}" ]]; then
"${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}" "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
fi
"${kubectl}" config set-context "${CONTEXT}" --cluster="${CONTEXT}" --user="${CONTEXT}" "${kubectl}" config set-context "${CONTEXT}" --cluster="${CONTEXT}" --user="${CONTEXT}"
"${kubectl}" config use-context "${CONTEXT}" --cluster="${CONTEXT}" "${kubectl}" config use-context "${CONTEXT}" --cluster="${CONTEXT}"

7
cluster/libvirt-coreos/util.sh
View File

@@ -200,7 +200,6 @@ function wait-cluster-readiness {
function kube-up { function kube-up {
detect-master detect-master
detect-minions detect-minions
get-password
initialize-pool keep_base_image initialize-pool keep_base_image
initialize-network initialize-network
@@ -328,12 +327,6 @@ function test-teardown {
kube-down kube-down
} }
# Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider
function get-password {
export KUBE_USER=''
export KUBE_PASSWORD=''
}
# SSH to a node by name or IP ($1) and run a command ($2). # SSH to a node by name or IP ($1) and run a command ($2).
function ssh-to-node { function ssh-to-node {
local node="$1" local node="$1"