github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4670 from derekwaynecarr/kube_up_gives_error

Browse Source 
Do not pass --kubeconfig during kube-up of vagrant
This commit is contained in:
Victor Marmol 2015-02-20 10:07:14 -08:00
commit 36cd155819
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/vagrant/util.sh
View File

@ -163,7 +163,7 @@ function verify-cluster {
local count="0" local count="0"
until [[ "$count" == "1" ]]; do until [[ "$count" == "1" ]]; do
local minions local minions
minions=$("${KUBE_ROOT}/cluster/kubectl.sh --kubeconfig=${HOME}/.kubernetes_vagrant_kubeconfig" get minions -o template -t '{{range.items}}{{.id}}:{{end}}') minions=$("${KUBE_ROOT}/cluster/kubectl.sh" get minions -o template -t '{{range.items}}{{.id}}:{{end}}')
count=$(echo $minions | grep -c "${MINION_IPS[i]}") || { count=$(echo $minions | grep -c "${MINION_IPS[i]}") || {
printf "." printf "."
sleep 2 sleep 2
@ -214,6 +214,7 @@ EOF
apiVersion: v1 apiVersion: v1
clusters: clusters:
- cluster: - cluster:
certificate-authority: ${HOME}/$ca_cert
server: https://${MASTER_IP}:443 server: https://${MASTER_IP}:443
name: vagrant name: vagrant
contexts: contexts: