Stop collecting addresses in launch script now we do it in Go

This commit is contained in:
Bryan Boreham committed 2017-02-10 15:11:14 +00:00
1 parent 39ac1a0037
commit e26dbf11e9
1 file changed
-17
-17
View File
@@ -66,14 +66,6 @@ if [ -z "$IPALLOC_INIT" ]; then
IPALLOC_INIT="consensus=$(peer_count $KUBE_PEERS)"
fi
reclaim_ips() {
ID=$1
shift
for CIDR in "$@" ; do
curl -s -S -X PUT "$HTTP_ADDR/ip/$ID/$CIDR" || true
done
}
post_start_actions() {
# Wait for weave process to become responsive
while true ; do
@@ -81,15 +73,6 @@ post_start_actions() {
sleep 1
done
# Tell the newly-started weave about existing weave bridge IPs
/usr/bin/weaveutil container-addrs weave weave:expose | while read ID IFACE MAC IPS; do
reclaim_ips "weave:expose" $IPS
done
# Tell weave about existing weave process IPs
/usr/bin/weaveutil process-addrs weave | while read ID IFACE MAC IPS; do
reclaim_ips "_" $IPS
done
# Install CNI plugin binary to typical CNI bin location
# with fall-back to CNI directory used by kube-up on GCI OS
if ! mkdir -p $HOST_ROOT/opt/cni/bin ; then