Matthias Radestock
a77201bf77
Merge pull request #1955 from weaveworks/weave-attach-bridge
...
'attach-bridge' feature to link an existing bridge netdev with the weave bridge
2016-02-09 15:45:28 +00:00
Adam Harrison
a3d842bf4a
Implement attach-bridge
2016-02-09 15:20:11 +00:00
Adam Harrison
43eb70193b
Merge branch '1.4'
2016-02-09 11:40:14 +00:00
Adam Harrison
1228dbddb9
Add release v1.4.4
2016-02-09 11:20:51 +00:00
Adam Harrison
a401d0d6ea
Merge branch '1.4'
2016-02-09 10:53:52 +00:00
Adam Harrison
c00b00d623
Merge pull request #1963 from weaveworks/issues/1959-dont-remove-network
...
Don't remove weave network on plugin shutdown because it bricks Docker 1.10
2016-02-09 10:53:13 +00:00
Bryan Boreham
7bbc9f1b82
Don't remove the weave network on shutdown because it bricks Docker 1.10
2016-02-09 10:02:06 +00:00
Matthias Radestock
6252871e93
Merge branch '1.4'
2016-02-09 09:30:19 +00:00
Matthias Radestock
15a92f9c92
Merge pull request #1961 from weaveworks/issues/1956-any-iface
...
Wait for multicast route on any interface
Fixes #1956 .
2016-02-09 09:29:05 +00:00
Bryan Boreham
9386c01845
Wait for multicast route on any interface, to match weave script
...
which only adds a route if there isn't one already
2016-02-08 14:04:25 +00:00
Adam Harrison
6d1e33b558
Merge pull request #1957 from weaveworks/issues/1949-ring-errors
...
Make error messages on ring merge clearer
2016-02-08 13:52:59 +00:00
Bryan Boreham
ed3c50f43e
Merge pull request #1951 from weaveworks/issues/1940-remove-proxy-dockerbridgeip-dep
...
Use netlink instead of shelling out to `weave docker-bridge-ip`
2016-02-08 11:05:10 +00:00
Bryan Boreham
9ac62e8005
Extract common getenv-testing code
2016-02-08 10:46:18 +00:00
Bryan Boreham
034da376c4
Make error messages on ring merge clearer
2016-02-08 10:13:41 +00:00
Matthias Radestock
10fbc75997
Merge pull request #1922 from weaveworks/issues/1179-its-alive
...
In IPAM, resurrect apparently-dead containers on ContainerStarted event
2016-02-05 16:36:28 +00:00
Matthias Radestock
98d76e1099
Merge pull request #1941 from weaveworks/issues/1873-check-running-master
...
Improve visibility of startup problems
Fixes #1873 .
2016-02-04 16:50:50 +00:00
Matthias Radestock
f2a1b3829d
tweak: consistency
2016-02-04 16:19:29 +00:00
Matthias Radestock
e47c4a78f0
Merge pull request #1948 from weaveworks/test-claimforpeers
...
Improve IPAM Ring unit testing, and streamline ring.ClaimForPeers
2016-02-04 15:31:00 +00:00
Bryan Boreham
f9f6649f90
Check some ring entries via AllRangeInfo, to improve coverage
2016-02-04 15:12:13 +00:00
Bryan Boreham
a5c9898884
Checking for existing entries is pointless when the Ring starts empty
2016-02-04 15:12:13 +00:00
Bryan Boreham
839eb28310
Unit test for ring.ClaimForPeers
2016-02-04 15:11:46 +00:00
Adam Harrison
e2ec2b436d
Use netlink instead of shelling out to weave docker-bridge-ip
2016-02-04 14:00:01 +00:00
Bryan Boreham
07b79568dd
Resurrect apparently-dead containers on ContainerStarted event
2016-02-04 13:49:43 +00:00
Bryan Boreham
1d3c80ab49
Merge pull request #1944 from weaveworks/issues/1940-remove-proxy-weaveps-dep
...
Use netlink instead of shelling out to `weave ps`
2016-02-04 13:45:58 +00:00
Bryan Boreham
38013d2f41
Kill zombies
2016-02-04 12:52:16 +00:00
Adam Harrison
65c48707f6
Use netlink instead of shelling out to weave ps
2016-02-04 12:51:18 +00:00
Adam Harrison
415e550f86
Merge pull request #1930 from weaveworks/issues/1746-always-use-host-netns
...
Always use host netns
2016-02-04 12:50:08 +00:00
Adam Harrison
034d8933c0
make multiweave work with weave running in the host netns
...
Multiweave now creates a temporary bridge with an IP alias per router
in the host netns, and overrides the router to bind to that specific
IP for weave protocol and data traffic and http control.
2016-02-03 11:57:12 +00:00
Matthias Radestock
cf24bb0e89
remove weaveapi.NewClientWithResolver cruft
2016-02-03 11:56:50 +00:00
Matthias Radestock
ae725e333a
make plugin pay attention to WEAVE_HTTP_ADDR
2016-02-03 11:54:05 +00:00
Matthias Radestock
dde244160b
make proxy pay attention to WEAVE_HTTP_ADDR
2016-02-03 11:28:38 +00:00
Matthias Radestock
fdd006022d
make weave control address configurable
2016-02-02 21:38:02 +00:00
Adam Harrison
1e01a31939
Support --host argument to weave launch
...
Allow the weave router bind to a specific host IP address instead of
INADDR_ANY.
2016-02-02 20:48:49 +00:00
Adam Harrison
4117ef0c50
Fix WEAVE_NO_FASTDP test on GCE
2016-02-02 20:48:49 +00:00
Matthias Radestock
e3c19d6414
get rid of container_ip
...
We already know what the weave container IP is, since now it runs in
the host netns.
2016-02-02 20:48:49 +00:00
Matthias Radestock
b1e6bc2929
Always use host netns
...
which allows us to get rid of port mappings and a whole bunch of other
code.
2016-02-02 20:48:49 +00:00
Matthias Radestock
feee4f0494
refactor: make proxy use weave/api
...
and extend that api as required, namely with DNSDomain()
2016-02-02 20:45:30 +00:00
Matthias Radestock
34ab86124b
fix typo
2016-02-02 20:31:38 +00:00
Adam Harrison
f37eb4b77d
Merge branch '1.4'
2016-02-02 16:52:20 +00:00
Adam Harrison
5232a9af6b
Add release v1.4.3
2016-02-02 16:35:32 +00:00
Adam Harrison
90795e5446
Merge branch '1.4'
...
Conflicts:
plugin/ipam/driver.go
2016-02-02 16:04:49 +00:00
Adam Harrison
c393b23b31
Merge pull request #1918 from weaveworks/issues/1906-plugin-no-weave
...
Return an error when weave isn't running, on RequestPool
2016-02-02 15:54:39 +00:00
Matthias Radestock
6bebce0b5a
tiny refactor
2016-02-02 14:03:01 +00:00
Bryan Boreham
71da517e88
Refactor to collect all code that touches alloc.owned
2016-02-02 13:57:12 +00:00
Matthias Radestock
faa7bad8d8
refactor with_container_netns
...
make it set CONTAINER_NETNS instead of CONTAINER_PID (well, it still
sets the latter, but not for effect), which reduces coupling.
2016-02-02 13:37:17 +00:00
Matthias Radestock
710c13ced9
correct typo in comment
2016-02-02 13:02:33 +00:00
Adam Harrison
6bd8da905e
Refactor: uniform use of weave_container_addresses
2016-02-02 11:30:36 +00:00
Adam Harrison
839f534350
Merge branch '1.4'
2016-02-01 15:30:51 +00:00
Adam Harrison
955fbca44a
Merge pull request #1943 from weaveworks/1942-mcast-iface-up
...
don't set the interface 'up' before it is fully configured
2016-02-01 15:29:46 +00:00
Matthias Radestock
18c26e9fbb
don't set the interface 'up' before it is fully configured
...
This was causing container entrypoints to execute too early,
e.g. before the interface had been given an IP address. But only when
running with --no-multicast-route, since otherwise weavewait is
waiting for the multicast route to appear.
Fixes #1942 .
2016-02-01 12:04:15 +00:00
Matthias Radestock