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

Merge pull request #18588 from tPl0ch/fix-aws-config-kube-up 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-15 04:32:49 -08:00
parent c2af9cac58 189f2436e3
commit bbbcc3e772
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/aws/util.sh
View File

@ -934,8 +934,13 @@ function start-master() {
wait-for-instance-state ${master_id} "running"
KUBE_MASTER=${MASTER_NAME}
KUBE_MASTER_IP=$(assign-elastic-ip $ip $master_id)
echo -e " ${color_green}[master running @${KUBE_MASTER_IP}]${color_norm}"
echo -e " ${color_green}[master running @${ip}]${color_norm}"
local attach_message
attach_message=$(assign-elastic-ip $ip $master_id)
# Get master ip again after attachment.
KUBE_MASTER_IP=$(get_instance_public_ip $master_id)
echo ${attach_message}
# This is a race between instance start and volume attachment. There appears to be no way to start an AWS instance with a volume attached.
# To work around this, we wait for volume to be ready in setup-master-pd.sh