@@ -137,6 +137,19 @@ while true; do
137137 esac
138138done
139139
140+ function multipass_mount {
141+ echo -n " Mount point $1 to $2 "
142+ while :
143+ do
144+ echo -n " ."
145+ multipass mount $1 $2 > /dev/null 2>&1 && break
146+ sleep 1
147+ done
148+ echo
149+ }
150+
151+ pushd $CURDIR /../
152+
140153# GRPC network endpoint
141154if [ " $TRANSPORT " == " unix" ]; then
142155 LISTEN=" ${PWD} /config/grpc.sock"
@@ -150,7 +163,7 @@ elif [ "$TRANSPORT" == "tcp" ]; then
150163 IPADDR=$( ifconfig $NET_IF | grep " inet\s" | sed -n 1p | awk ' {print $2}' )
151164 fi
152165
153- LISTEN=" 0:0:0: 0:${PORT} "
166+ LISTEN=" 0.0.0. 0:${PORT} "
154167 CONNECTTO=" ${IPADDR} :${PORT} "
155168else
156169 echo " Unknown transport: ${TRANSPORT} , should be unix or tcp"
@@ -295,8 +308,6 @@ MACHINE_DEFS=$(
295308EOF
296309)
297310
298- pushd $CURDIR /../
299-
300311[ -d config ] || mkdir -p config
301312[ -d cluster ] || mkdir -p cluster
302313[ -d kubernetes ] || mkdir -p kubernetes
359370
360371 ROOT_IMAGE=$( dirname $TARGET_IMAGE )
361372
362- multipass mount $PWD /bin imagecreator:/masterkube/bin
363- multipass mount $HOME /.local/multipass/cache/ imagecreator:/home/multipass/.local/multipass/cache/
364- multipass mount $ROOT_IMAGE imagecreator:$ROOT_IMAGE
373+ multipass_mount $PWD /bin imagecreator:/masterkube/bin
374+ multipass_mount $HOME /.local/multipass/cache/ imagecreator:/home/multipass/.local/multipass/cache/
375+ multipass_mount $ROOT_IMAGE imagecreator:$ROOT_IMAGE
365376
366377 echo " Create multipass preconfigured image (could take a long)"
367378
@@ -432,20 +443,17 @@ if [ "$LOWBANDWIDTH" != "YES" ] && [ "$CUSTOM_IMAGE" != "YES" ] && [ "$OSDISTRO"
432443 multipass start masterkube
433444fi
434445
435- sudo mkdir -p /var/run/cluster-autoscaler
436-
437- multipass mount $PWD /bin masterkube:/masterkube/bin
438- multipass mount $PWD /templates masterkube:/masterkube/templates
439- multipass mount $PWD /etc masterkube:/masterkube/etc
440- multipass mount $PWD /cluster masterkube:/etc/cluster
441- multipass mount $PWD /kubernetes masterkube:/etc/kubernetes
442- multipass mount $PWD /config masterkube:/etc/cluster-autoscaler
443- multipass mount /var/run/cluster-autoscaler masterkube:/var/run/cluster-autoscaler
446+ multipass_mount $PWD /bin masterkube:/masterkube/bin
447+ multipass_mount $PWD /templates masterkube:/masterkube/templates
448+ multipass_mount $PWD /etc masterkube:/masterkube/etc
449+ multipass_mount $PWD /cluster masterkube:/etc/cluster
450+ multipass_mount $PWD /kubernetes masterkube:/etc/kubernetes
451+ multipass_mount $PWD /config masterkube:/etc/cluster-autoscaler
444452
445453if [ " $LOWBANDWIDTH " == " YES" ]; then
446- multipass mount " $KUBERNETES_CACHE /kubernetes" masterkube:/opt/bin
447- multipass mount " $KUBERNETES_CACHE /docker" masterkube:/opt/docker
448- multipass mount " $KUBERNETES_CACHE /cni" masterkube:/opt/cni/bin
454+ multipass_mount " $KUBERNETES_CACHE /kubernetes" masterkube:/opt/bin
455+ multipass_mount " $KUBERNETES_CACHE /docker" masterkube:/opt/docker
456+ multipass_mount " $KUBERNETES_CACHE /cni" masterkube:/opt/cni/bin
449457fi
450458
451459echo " Prepare masterkube instance"
0 commit comments