mirror of https://github.com/k3s-io/k3s
Merge pull request #1155 from derekwaynecarr/improve_vagrant_startup
Improve kube-up to validate salt provisioned each machinepull/6/head
commit
ccfdf14097
|
@ -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]"
|
||||
done
|
||||
VAGRANT_MINION_NAMES[$i]="minion-$[$i+1]"
|
||||
done
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"}
|
||||
|
||||
function detect-master () {
|
||||
echo "KUBE_MASTER_IP: $KUBE_MASTER_IP"
|
||||
echo "KUBE_MASTER: $KUBE_MASTER"
|
||||
echo "KUBE_MASTER_IP: $KUBE_MASTER_IP"
|
||||
echo "KUBE_MASTER: $KUBE_MASTER"
|
||||
}
|
||||
|
||||
# Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[]
|
||||
function detect-minions {
|
||||
echo "Minions already detected"
|
||||
echo "Minions already detected"
|
||||
}
|
||||
|
||||
# Verify prereqs on host machine
|
||||
|
@ -39,39 +39,88 @@ function verify-prereqs {
|
|||
}
|
||||
|
||||
# Instantiate a kubernetes cluster
|
||||
function kube-up {
|
||||
vagrant up
|
||||
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
|
||||
function kube-down {
|
||||
vagrant destroy -f
|
||||
vagrant destroy -f
|
||||
}
|
||||
|
||||
# Update a kubernetes cluster with latest source
|
||||
function kube-push {
|
||||
vagrant provision
|
||||
vagrant provision
|
||||
}
|
||||
|
||||
# Execute prior to running tests to build a release if required for env
|
||||
function test-build-release {
|
||||
echo "Vagrant provider can skip release build"
|
||||
echo "Vagrant provider can skip release build"
|
||||
}
|
||||
|
||||
# Execute prior to running tests to initialize required structure
|
||||
function test-setup {
|
||||
echo "Vagrant test setup complete"
|
||||
echo "Vagrant test setup complete"
|
||||
}
|
||||
|
||||
# Execute after running tests to perform any required clean-up
|
||||
function test-teardown {
|
||||
echo "Vagrant ignores tear-down"
|
||||
echo "Vagrant ignores tear-down"
|
||||
}
|
||||
|
||||
# Set the {user} and {password} environment values required to interact with provider
|
||||
function get-password {
|
||||
export user=vagrant
|
||||
export passwd=vagrant
|
||||
echo "Using credentials: $user:$passwd"
|
||||
export user=vagrant
|
||||
export passwd=vagrant
|
||||
echo "Using credentials: $user:$passwd"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue