Adam Harrison
ccae8d42fd
Merge remote-tracking branch 'dpw/fdp-probe-vxlan' into 1.2
...
Fixes #1599
2015-11-02 17:24:52 +00:00
David Wragg
38f78286c7
Probe whether the kernel has ODP vxlan support
...
It's possible to build that kernel with openvswitch, and vxlan, but
without the vport_vxlan module that glues them together. And at
least one distro has actually done this.
2015-11-02 15:53:16 +00:00
Bryan Boreham
2bbe6a2ad8
Merge pull request #1622 from weaveworks/fix-miekg-dns-truncation-test
...
LGTM
2015-11-02 15:09:57 +00:00
Adam Harrison
f64f63f675
Handle truncated responses from upstream servers
2015-11-02 15:00:02 +00:00
Adam Harrison
f0fb44f6d4
Update unit test for miekg DNS API change
2015-11-02 13:24:04 +00:00
Paul Bellamy
fa972615e6
Merge pull request #1616 from weaveworks/1549-inspect-wait
...
Make inspect-rewrite wait for start
2015-11-02 11:00:23 +00:00
Bryan Boreham
f7cb2ef25d
have waitForStartByIdent() return an error
2015-10-30 13:46:30 +00:00
Bryan Boreham
949f8bb2e7
Move updateContainerNetworkSettings() into proxy
2015-10-30 13:34:16 +00:00
Bryan Boreham
5eaff802d4
Make inspect-rewrite wait if the start operation is still in progress
2015-10-30 13:34:16 +00:00
Matthias Radestock
a6336149f8
guard against chef not running
...
Provisioning on ubuntu/wily64 was tripping over this.
2015-10-30 01:29:21 +00:00
Matthias Radestock
ca6bce3820
Merge branch 'latest_release_doc_updates' into 1.2
2015-10-28 09:20:46 +00:00
Matthias Radestock
9b4f2297b0
drop quotes in eval "$(weave env)"
...
They are unnecessary and unwieldy.
Fixes #1596
2015-10-28 09:19:10 +00:00
Matthias Radestock
a31b2876d0
Merge pull request #1598 from weaveworks/issues/1584-improved-proxy-router-restart
...
Improved detection of router container restart
Fixes #1584
2015-10-28 08:51:06 +00:00
Matthias Radestock
b697b6e57b
Merge pull request #1597 from weaveworks/issues/1516-weavedns-ignore-foreign-domains
...
Check weaveDNS subdomain on REST PUT
Fixes #1516
2015-10-28 08:50:25 +00:00
Adam Harrison
4792fe6391
Improved detection of router container restart
...
Use the container name in addition to the entrypoint to avoid triggering
reattachment unnecessarily.
2015-10-27 14:41:26 +00:00
Adam Harrison
7408f72de2
Check weaveDNS subdomain on REST PUT
2015-10-27 14:37:57 +00:00
Ilya Dmitrichenko
3a029686e3
Add Pardot script
2015-10-22 15:07:52 -07:00
Matthias Radestock
9fa7b3956d
Merge remote-tracking branch 'upstream/master'
2015-10-22 16:17:55 +01:00
Matthias Radestock
b888ace508
remove superfluous code in ApplyUpdate
...
If the local peer's short ID was updated, we broadcastPeerUpdate at
the end (in unlockAndNotify), so there is no need to include the local
peer in the current update.
Also, reading peers.ourself.Version is bad here - we don't take a lock
and it's written by other goroutines. Doesn't actually break anything
though since it's a uint64 and hence atomic.
2015-10-22 16:12:37 +01:00
Bryan Boreham
2e54efe34d
Stop the proxy last, so we can stop the router
...
before being unable to communicate with docker
when $DOCKER_HOST is pointing at the proxy
2015-10-22 15:45:54 +01:00
Bryan Boreham
94d7f33a03
Merge pull request #1541 from weaveworks/weave-1.2-readme-updates
...
Update README for 1.2 release
v1.2.0
2015-10-22 13:22:54 +01:00
Bryan Boreham
11598295cf
Add release v1.2.0
2015-10-22 12:53:57 +01:00
Bryan Boreham
383c3769aa
Try en even bigger sleep
2015-10-22 12:19:57 +01:00
Adam Harrison
caccba18e9
Mention fast datapath port
2015-10-22 11:58:14 +01:00
Paul Bellamy
95ce00e551
moving boot2docker instructions into the readme
2015-10-22 11:58:14 +01:00
David Wragg
85dad58cfe
Pass --privileged for the temporary container in rewrite_etc_hosts
...
Otherwise we run into selinux issues on fedora23 (and probably other
selinux distros).
2015-10-22 11:44:17 +01:00
Bryan Boreham
acdc70f72a
Merge pull request #1560 from weaveworks/1542-proxy-bug-weave-not-running
...
LGTM. Fixes #1542
2015-10-22 10:19:32 +01:00
Paul Bellamy
bc9db72212
[proxy] Add notifyWaiters to fix anticipated race condition.
...
* User makes /start request, and blocks on the waiter
* ContainerStarted fires with ID
* Container goes away
* We try to inspect the container to get the entrypoint, which fails
* Previously, this wouldn't call notifyWaiters and the /start would hang (I expect)
2015-10-22 09:50:12 +01:00
Adam Harrison
7905f81d7e
Merge pull request #1570 from dpw/mac-invalidate-routes
...
Do InvalidateRoutes when a forwarded packet updates a MAC cache entry
2015-10-21 23:54:56 +01:00
Matthias Radestock
2ef9cc6a1c
start temporary containers without networking when possible
...
This is more efficient and TRTTD
Closes #1572 .
2015-10-21 16:52:19 +01:00
Matthias Radestock
2357b69a5f
nicer interface name
...
and more likely to be ignored by NetworkManager
Closes #1567 .
2015-10-21 16:22:16 +01:00
Matthias Radestock
98b47f866b
Merge pull request #1569 from weaveworks/issues/1565-docker-1.9.0-workaround
...
Reorder inspect template to work around docker/docker#17026
Fixes #1565 .
2015-10-21 15:29:59 +01:00
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
Paul Bellamy
63339c026d
[proxy] return errors when attaching new containers
...
I had implemented this with a promise, but was informed that as
waitForStart is only called once, we are safe to just put the error into
the channel.
2015-10-21 13:05:05 +01:00
Adam Harrison
40922b88f7
Reorder inspect template to work around docker/docker#17026
2015-10-21 12:39:55 +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
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