github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 18:52:38 +00:00
Code Issues Projects Releases Wiki Activity

Wait for master instance running before adding route

Browse Source
This commit is contained in:
Justin Santa Barbara
2015-03-26 10:22:50 -07:00
parent c1364d03dc
commit 9556318c58
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cluster/aws/util.sh
View File

@@ -330,6 +330,21 @@ function ensure-iam-profiles {
} }
} }
# Wait for instance to be in running state
function wait-for-instance-running {
instance_id=$1
while true; do
instance_state=$($AWS_CMD describe-instances --instance-ids $instance_id | expect_instance_states running)
if [[ "$instance_state" == "" ]]; then
break
else
echo "Waiting for instance ${instance_id} to spawn"
echo "Sleeping for 3 seconds..."
sleep 3
fi
done
}
function kube-up { function kube-up {
find-release-tars find-release-tars
upload-server-tars upload-server-tars
@@ -467,6 +482,9 @@ function kube-up {
else else
KUBE_MASTER=${MASTER_NAME} KUBE_MASTER=${MASTER_NAME}
KUBE_MASTER_IP=${ip} KUBE_MASTER_IP=${ip}
# We are not able to add a route to the instance until that instance is in "running" state.
wait-for-instance-running $master_id
sleep 10
$AWS_CMD create-route --route-table-id $ROUTE_TABLE_ID --destination-cidr-block ${MASTER_IP_RANGE} --instance-id $master_id > $LOG $AWS_CMD create-route --route-table-id $ROUTE_TABLE_ID --destination-cidr-block ${MASTER_IP_RANGE} --instance-id $master_id > $LOG
echo -e " ${color_green}[master running @${KUBE_MASTER_IP}]${color_norm}" echo -e " ${color_green}[master running @${KUBE_MASTER_IP}]${color_norm}"
@@ -532,19 +550,10 @@ function kube-up {
# We are not able to add a route to the instance until that instance is in "running" state. # We are not able to add a route to the instance until that instance is in "running" state.
# This is quite an ugly solution to this problem. In Bash 4 we could use assoc. arrays to do this for # This is quite an ugly solution to this problem. In Bash 4 we could use assoc. arrays to do this for
# all instances at once but we can't be sure we are running Bash 4. # all instances at once but we can't be sure we are running Bash 4.
while true; do wait-for-instance-running $minion_id
instance_state=$($AWS_CMD describe-instances --instance-ids $minion_id | expect_instance_states running) echo "Minion ${MINION_NAMES[$i]} running"
if [[ "$instance_state" == "" ]]; then sleep 10
echo "Minion ${MINION_NAMES[$i]} running" $AWS_CMD create-route --route-table-id $ROUTE_TABLE_ID --destination-cidr-block ${MINION_IP_RANGES[$i]} --instance-id $minion_id > $LOG
sleep 10
$AWS_CMD create-route --route-table-id $ROUTE_TABLE_ID --destination-cidr-block ${MINION_IP_RANGES[$i]} --instance-id $minion_id > $LOG
break
else
echo "Waiting for minion ${MINION_NAMES[$i]} to spawn"
echo "Sleeping for 3 seconds..."
sleep 3
fi
done
done done
FAIL=0 FAIL=0