Bryan Boreham
ecbd514a83
Tighten error checking
2015-06-10 17:21:16 +01:00
Bryan Boreham
50eaccc60c
Allocate() and Lookup() now return a CIDR, to simplify output
2015-06-10 17:21:16 +01:00
Bryan Boreham
2a00b0092d
Extend 'Lookup' to multi-subnet
2015-06-10 17:21:16 +01:00
Bryan Boreham
d18ccac43b
Free IPAM addresses individually in 'weave hide', because the user now has the ability to free some subnets and not others
2015-06-10 17:21:16 +01:00
Bryan Boreham
a617e7918c
Introduce single-address Free() and rename the previous one to Delete()
2015-06-10 17:21:16 +01:00
Bryan Boreham
d20d2e9142
Update smoke tests that use IPAM with default subnet
2015-06-10 17:21:16 +01:00
Bryan Boreham
551394a831
Add subnet info to space requests from one peer to another
2015-06-10 17:21:16 +01:00
Bryan Boreham
0613a06653
IPAM: handle multiple CIDRs in weave script
2015-06-10 17:21:16 +01:00
Bryan Boreham
ff545feae3
Add some unit tests for multi-subnet
2015-06-10 17:21:16 +01:00
Bryan Boreham
c7a9dfbb3f
Remember multiple addresses owned by each container, for multi-subnet use
2015-06-10 17:21:16 +01:00
Bryan Boreham
2553850ed4
Initial implementation of multi-subnet IPAM
2015-06-10 17:21:16 +01:00
Bryan Boreham
e6d230042d
Introduce address.CIDR type
2015-06-10 17:21:16 +01:00
Bryan Boreham
ae8985deb5
Merge pull request #884 from rade/881_get_container_id_on_start
...
LGTM. Fixes #881
2015-06-10 17:20:25 +01:00
Matthias Radestock
18bc3c2b99
"online dictionary attacks" is better terminology
2015-06-10 16:40:25 +01:00
Matthias Radestock
afd0275042
Merge pull request #848 from paulbellamy/proxy-env
...
add proxy-env and proxy-config
Closes #753 .
2015-06-10 15:34:32 +01:00
Paul Bellamy
2d5e362115
[proxy] use logs for getting proxy-env and proxy-config
...
It's ugly, but beats arg-parsing, inspecting the container and piecing
the address together from exposed ports.
We could just use the host from DOCKER_HOST, but that will fail in the
case of a host with multiple IPs, where the proxy only listens on one.
2015-06-10 15:24:53 +01:00
Matthias Radestock
7a2b5c43e7
feed full container id on weave start to DNS/IPAM
...
We erroneously assumed that `docker start` returned the full container
id. It doesn't and as a result we populated DNS with records with ids
other than full container ids. And that's also what we told IPAM. As a
result, DNS and IPAM didn't clean up after the container's death,
resulting in stale DNS entries and leaked IPs.
Fixes #881 .
2015-06-10 14:53:43 +01:00
Matthias Radestock
0ab7c31bbe
Merge pull request #886 from bboreham/885-gossip-race
...
Avoid gossip test race conditions
Fixes #885 .
2015-06-10 13:50:40 +01:00
Bryan Boreham
0cd4127087
Factor out GossipSender.flush()
2015-06-10 12:24:19 +01:00
Bryan Boreham
5ebfc9027b
Flush gossip inside the channel lock so we know sender hasn't been Stop()-ed
2015-06-10 12:22:38 +01:00
Matthias Radestock
fe6d05fccc
Merge pull request #875 from paulbellamy/proxy-port
...
Add support for custom proxy bind address
Closes #805 . Closes #810 .
2015-06-10 12:19:41 +01:00
Bryan Boreham
35b3a2d6a6
Inline GossipSender.flush() and don't try to send nil
2015-06-10 12:18:09 +01:00
Paul Bellamy
6bb087cecd
[proxy] Renaming flags: -H -> -D, -L -> -H
...
As per discussion in issue 875
2015-06-10 12:13:52 +01:00
Paul Bellamy
447a00ba7e
[proxy] Add support for tcp:// prefix on listen addresses
2015-06-10 12:13:52 +01:00
Paul Bellamy
0da9669e5c
[proxy] removing unneeded port expose
2015-06-10 12:13:51 +01:00
Paul Bellamy
4a7d4d3555
[proxy] documenting -L option
2015-06-10 12:13:51 +01:00
Paul Bellamy
1ac5d4fe98
renaming dns_restart_test so it is picked up by test runner
2015-06-10 11:52:58 +01:00
Bryan Boreham
bd5353024f
Helpful suggestions from the linter
2015-06-10 11:05:04 +01:00
Bryan Boreham
569fd784fa
Make flushing of GossipSender wait till done in tests,
...
and take extra locks to avoid race conditions.
Also removed the sendPendingGossip() from mockChannelConnection.SendProtocolMsg(),
because waiting in flush now creates a deadlock. Tests will have to
call sendPendingGossip() explicitly if they need it.
2015-06-10 10:59:54 +01:00
Matthias Radestock
bd364f787e
fix silent failure in assert_dns_record test
...
If the name cannot be resolved, getent fails, which in turn causes
assert_dns_record to just return with a non-zero status at that point,
which causes the whole test to just terminate with a non-zero status,
but no indication whatsoever what had gone wrong.
2015-06-09 19:08:59 +01:00
Matthias Radestock
ca133d6d9b
Call LocalPeer.Encode, not Peer.Encode!
...
We need the former's locking.
Fixes #883 .
2015-06-09 17:19:36 +01:00
Matthias Radestock
94f18f7004
remove outdated comment
2015-06-09 15:52:15 +01:00
Paul Bellamy
e324c15b04
Merge pull request #879 from rade/proxy_interceptor_refactor
...
Proxy interceptor refactor
2015-06-09 14:50:54 +01:00
Matthias Radestock
5c70c7c71a
simplify interceptor structs by referencing proxy
2015-06-09 14:45:50 +01:00
Matthias Radestock
020a9ea396
rename file
2015-06-09 14:45:50 +01:00
Matthias Radestock
3f9c7a5c00
remove pointless indirection
2015-06-09 14:45:50 +01:00
Matthias Radestock
f025b6ea36
refactor interceptor invocation
2015-06-09 14:45:42 +01:00
Paul Bellamy
03fa95fcb5
Merge pull request #878 from rade/877_remove_proxy_status
...
remove most of proxy status
2015-06-09 14:24:53 +01:00
Matthias Radestock
fee2898c05
remove detailed proxy status
...
There are two problems with obtaining the proxy status via the normal
proxy endpoint...
1. when TLS is enabled, this requires using TLS at the client end
2. the status URL is mixed in with the docker remote API, which is
rather unclean
There is limited value to having some status output from the proxy,
since all the output is constant.
So instead we log the version and command line args, and in `weave
status` only report whether the proxy is running.
We still want a way to wait for the proxy to start up, and log a nice
error if it dies. We do this by polling the docker logs for a startup
message.
Fixes #877 . Fixes #876 .
Undoes most of #756 , #800 , #854 .
2015-06-09 14:03:52 +01:00
Matthias Radestock
2d70197221
cosmetic: more formal command grammar
2015-06-08 23:57:53 +01:00
Matthias Radestock
f9c325c793
refactor: more sensible field order
2015-06-08 21:57:49 +01:00
Ilya Dmitrichenko
235acc16f6
Merge pull request #874 from weaveworks/header-markup-refactor
...
[site] header markup needs change after refactor
2015-06-08 15:07:08 +01:00
Bryan Boreham
011c86fdca
Merge pull request #852 from rade/816_make_launch_args_order_insensitive
...
LGTM. Fixes #816
2015-06-08 14:34:46 +01:00
Alvaro Saurin
bb3dd55a10
Merge branch '0.11'
...
Conflicts:
nameserver/cache_test.go
2015-06-08 13:41:38 +02:00
Matthias Radestock
3f274d02ce
make weave launch args insensitive to order
...
Fixes #816 .
2015-06-08 12:41:26 +01:00
David Kaltschmidt
f65e02477e
[site] header markup needs change after refactor
...
due to change in stylesheet in website repo
this change does not affect current deployment, but has to be deployed
when the website is deployed again
2015-06-08 13:19:58 +02:00
Matthias Radestock
8a5725fa74
correct docs for proxy's -H
2015-06-08 10:26:21 +01:00
Adam Harrison
0df28f58df
Merge pull request #849 from inercia/weave-fix-neg-ttl
...
Do not overwrite negLocal entries in the cache
2015-06-08 09:59:32 +01:00
Matthias Radestock
9d707b9670
add proxy troubleshooting docs
...
Closes #854 .
2015-06-07 13:32:02 +01:00
Matthias Radestock
ad92bbc8c8
get rid of proxy 'Advantages' section
...
instead point out the main purpose right at the top, and list further
benefits in the 'Usage'.
Also, expand docs on configuring the listener.
2015-06-06 23:57:20 +01:00