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

Merge pull request #1155 from derekwaynecarr/improve_vagrant_startup 

Improve kube-up to validate salt provisioned each machine
pull/6/head
Joe Beda 2014-09-04 13:39:34 -07:00
parent 8bfba149a5 4b4be926f5
commit ccfdf14097
2 changed files with 64 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/vagrant/config-default.sh
View File

@ -28,4 +28,5 @@ MINION_IP_BASE="10.245.2."
for (( i=0; i <${NUM_MINIONS}; i++)) do
KUBE_MINION_IP_ADDRESSES[$i]="${MINION_IP_BASE}$[$i+2]"
MINION_NAMES[$i]="${MINION_IP_BASE}$[$i+2]"
VAGRANT_MINION_NAMES[$i]="minion-$[$i+1]"
done

49
cluster/vagrant/util.sh
View File

@ -40,7 +40,56 @@ function verify-prereqs {
# Instantiate a kubernetes cluster
function kube-up {
get-password
vagrant up
echo "Each machine instance has been created."
echo " Now waiting for the Salt provisioning process to complete on each machine."
echo " This can take some time based on your network, disk, and cpu speed."
echo " It is possible for an error to occur during Salt provision of cluster and this could loop forever."
# verify master has all required daemons
echo "Validating master"
MACHINE="master"
REQUIRED_DAEMON=("salt-master" "salt-minion" "apiserver" "nginx" "controller-manager" "scheduler")
VALIDATED="1"
until [ "$VALIDATED" -eq "0" ]; do
VALIDATED="0"
for daemon in ${REQUIRED_DAEMON[@]}; do
vagrant ssh $MACHINE -c "which $daemon" >/dev/null 2>&1 || { printf "."; VALIDATED="1"; sleep 2; }
done
done
# verify each minion has all required daemons
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
echo "Validating ${VAGRANT_MINION_NAMES[$i]}"
MACHINE=${VAGRANT_MINION_NAMES[$i]}
REQUIRED_DAEMON=("salt-minion" "kubelet" "docker")
VALIDATED="1"
until [ "$VALIDATED" -eq "0" ]; do
VALIDATED="0"
for daemon in ${REQUIRED_DAEMON[@]}; do
vagrant ssh $MACHINE -c "which $daemon" >/dev/null 2>&1 || { printf "."; VALIDATED="1"; sleep 2; }
done
done
done
echo
echo "Waiting for each minion to be registered with cloud provider"
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
COUNT="0"
until [ "$COUNT" -eq "1" ]; do
$(dirname $0)/kubecfg.sh -template '{{range.Items}}{{.ID}}:{{end}}' list minions > /tmp/minions
COUNT=$(grep -c ${MINION_NAMES[i]} /tmp/minions) || { printf "."; sleep 2; COUNT="0"; }
done
done
echo
echo "Kubernetes cluster created."
echo
echo "Kubernetes cluster is running. Access the master at:"
echo
echo " https://${user}:${passwd}@${KUBE_MASTER_IP}"
}
# Delete a kubernetes cluster