David Wragg
d2dfb0d15d
Do InvalidateRoutes when a forwarded packet updates a MAC cache entry
...
When we get a forwarded packet, we put its source MAC into the MAC cache,
overriding any existing entry. But we could have a flow which says
to forward packets destined to that MAC based on the old entry. Such
a flow could be prolonged indefinitely by attempts to send to the MAC.
This is obviously bad, so do InvalidateRoutes in such cases.
2015-10-21 13:46:18 +01:00
Bryan Boreham
674c617c16
Merge branch '1.1'
2015-10-21 11:52:49 +01:00
Bryan Boreham
2884b6deca
Add release v1.1.2
2015-10-20 17:06:14 +01:00
Adam Harrison
720862dafb
Merge pull request #1562 from dpw/fdp-create-bridge
...
'weave --local create-bridge' is not compatible with fastdp
2015-10-20 16:37:20 +01:00
David Wragg
5120b4b468
'weave --local create-bridge' is not compatible with fastdp
2015-10-20 16:34:50 +01:00
Adam Harrison
c5f5d4543e
Merge pull request #1518 from weaveworks/401-reattach-weave2
...
Get proxy to re-attach weave router if it restarts
2015-10-20 15:31:13 +01:00
Paul Bellamy
baf92da9f2
Merge pull request #1534 from weaveworks/1531-check-hostconfig
...
Take more care over HostConfig on start request in proxy
2015-10-20 12:18:49 +01:00
Paul Bellamy
526c9c3d73
Add test for {"HostConfig":{}} overriding previous settings, but still connecting to weave
2015-10-20 11:26:29 +01:00
Bryan Boreham
119d87b795
Extract repeated test into function
2015-10-20 11:26:29 +01:00
Bryan Boreham
17b030cca1
Cope with client sending a HostConfig named HostConfig
2015-10-20 11:26:29 +01:00
Bryan Boreham
81c9b3f327
Check that HostConfig parameters supplied on /start are passed to Docker,
...
also what happens when you supply a HostConfig named HostConfig
2015-10-20 11:26:29 +01:00
Bryan Boreham
50198a2159
Don't create a HostConfig accidentally if none was passed in
2015-10-20 11:26:29 +01:00
Bryan Boreham
20c8b1eaf6
Reverse the sense of a test, to simplify the next change
...
and remove unused struct
2015-10-20 11:26:21 +01:00
Bryan Boreham
faf94b033d
Extend test to check we don't overwrite HostConfig
2015-10-20 11:25:06 +01:00
Adam Harrison
342b3d3d08
Merge pull request #1557 from weaveworks/issues/1497
...
Add container FQDN to /etc/hosts
2015-10-20 11:22:22 +01:00
Bryan Boreham
26d43f193e
Move docker restart test above the place where we stop part of weave
2015-10-20 07:07:04 +00:00
Alvaro Saurin
f04ae91c82
Add container FQDN to /etc/hosts
2015-10-19 21:51:38 +02:00
Bryan Boreham
bb5515113f
Make attach-router work in fastdp+encryption case
2015-10-19 15:49:07 +00:00
Bryan Boreham
c09d84efc6
Move setup_router_iface call so we don't kill an already-running router on attach-router
2015-10-19 15:49:07 +00:00
Bryan Boreham
2a99a2a597
Don't fail if the arg we're looking for isn't there
2015-10-19 15:47:44 +00:00
Bryan Boreham
08f6dcf08d
Missing format
2015-10-19 15:47:44 +00:00
Bryan Boreham
284d78c6b2
Update fetch_router_args in line with changes elsewhere
2015-10-19 15:47:44 +00:00
Bryan Boreham
b8b5fb9eae
Review feedback
2015-10-19 15:47:43 +00:00
Bryan Boreham
697ee62d9a
Use entrypoint to detect weave router
2015-10-19 15:47:43 +00:00
Bryan Boreham
20ac0edda8
Try a bigger sleep to get Docker restarted
2015-10-19 15:46:48 +00:00
Bryan Boreham
a1bbb06e2f
Don't need depreciation warnings on internal-only command
2015-10-19 15:46:47 +00:00
Bryan Boreham
a87cc5c3b1
Get the proxy to re-attach the weave router if it sees it restart
2015-10-19 15:46:47 +00:00
Matthias Radestock
5ff740cddc
cosmetic
2015-10-19 15:43:49 +01:00
Matthias Radestock
db9229f485
Merge pull request #1551 from weaveworks/1547-proxy-restart-no-kill-containers
...
Proxy restart shouldn't kill containers
Fixes #1547 .
2015-10-19 13:55:48 +01:00
Paul Bellamy
ace6c01b00
Review feedback
2015-10-19 13:53:20 +01:00
Bryan Boreham
2f4d460c04
Merge pull request #1517 from weaveworks/1385-non-container-dns-add
...
LGTM. Fixes #1385
2015-10-19 12:52:09 +01:00
Matthias Radestock
d5401ae3cb
Merge pull request #1550 from dpw/weave2-eexist
...
Don't fail in launch-router if weave2 already exists
Fixes #1548 .
2015-10-16 21:36:45 +01:00
David Wragg
3482a7f1f1
Don't fail in launch-router if weave2 already exists
...
And delete weave2 on stop-router.
2015-10-16 20:59:06 +01:00
David Wragg
23762e0639
Move repeated 'stop' code into functions
2015-10-16 20:55:44 +01:00
Bryan Boreham
50cc15af3b
Merge pull request #1477 from weaveworks/weave-1374
...
LGTM. Fixes #1374
2015-10-16 18:02:16 +01:00
Paul Bellamy
a0f0367e60
[proxy] don't kill containers when starting the proxy
2015-10-16 15:33:43 +01:00
Adam Harrison
3f08ddefe9
Correct DisplayName implementation
2015-10-16 12:24:38 +01:00
Adam Harrison
debe656f9f
Merge pull request #1522 from dpw/fdp-compat
...
Fast datapath compatibility with 1.1
2015-10-16 11:26:20 +01:00
Alvaro Saurin
4350b6402f
Updated docs
2015-10-16 11:47:07 +02:00
Alvaro Saurin
5d2892f6fc
Test we respect --add-host when rewriting /etc/hosts
...
Simplify some tests
2015-10-16 11:47:07 +02:00
Alvaro Saurin
91f27ddd66
Removed weavehosts
2015-10-16 11:47:07 +02:00
Alvaro Saurin
6a674d0d67
Add hosts when attaching
2015-10-16 11:47:07 +02:00
Alvaro Saurin
0d165487b8
Rewrite /etc/hosts in the containers
2015-10-16 11:47:07 +02:00
Matthias Radestock
bacc5836ea
log listeners
2015-10-16 09:34:20 +01:00
Matthias Radestock
230931a2c9
prevent accidental var shadowing
...
Fixes #1544
2015-10-16 01:05:04 +01:00
Matthias Radestock
61d289f414
Merge branch '1.1'
2015-10-15 18:14:20 +01:00
Matthias Radestock
44255862a9
prevent spurious errors from showing up
...
silly mistake
2015-10-15 18:12:56 +01:00
Matthias Radestock
ed9577150b
suppress spurious errors
2015-10-15 18:01:06 +01:00
Matthias Radestock
80319e7087
Merge branch '1.1'
2015-10-15 17:41:49 +01:00
Matthias Radestock
379048d8fc
make test/setup.sh work under go 1.5
...
Fixes #1543 .
2015-10-15 17:40:51 +01:00
David Wragg