Matthias Radestock
e1c07dce3f
permit overriding of DOCKERHUB_USER
...
which in turn enables operation from private registries
Closes #887 .
2015-06-11 11:50:55 +01:00
Matthias Radestock
9955de3e9b
cosmetic: shorten usage info
2015-06-11 09:23:58 +01:00
David Wragg
5ce4b25f38
Merge rade/746_simplify_frag_test (PR #888 ): simplify fragmentation test
...
Closes #746 .
2015-06-10 18:28:26 +01:00
Matthias Radestock
267716fed5
Merge pull request #827 from bboreham/675-ipam-subnets
...
multi-subnet ipam
Closes #675 . Fixes #861 . Closes #862 .
2015-06-10 17:44:17 +01:00
Bryan Boreham
a89b549c40
Change command-line syntax to net: prefix instead of --subnet
2015-06-10 17:28:06 +01:00
Bryan Boreham
91ad3ef684
Illustrate mix-and-match of ipam and non-ipam CIDRs on command-line
2015-06-10 17:27:07 +01:00
Bryan Boreham
36f793c1f4
Delete entry from addresses map when slice is empty
2015-06-10 17:27:07 +01:00
Bryan Boreham
c27cd5b4ab
Extract lookup function for owned addresses
2015-06-10 17:27:07 +01:00
Bryan Boreham
7d881a0f0c
Check that weave ps returns exactly the CIDRs we are looking for, and comment assumption
2015-06-10 17:27:07 +01:00
Bryan Boreham
487bd2eaf7
Use zero-cidr-args form of 'weave detach' to test #862
2015-06-10 17:24:36 +01:00
Bryan Boreham
e9d194327a
Reduce level of noise in debug logs from containers dying
2015-06-10 17:24:36 +01:00
Bryan Boreham
c301e6a380
Expand test to use IPAM and check addresses are freed
2015-06-10 17:24:36 +01:00
Bryan Boreham
a3d73be8b8
General tidying
...
tidy Address helper functions,
make ordering of members consistent in allocate and claim,
make linter happier,
remove some unused items, and
update some comments
2015-06-10 17:24:36 +01:00
Bryan Boreham
fa0b0042b2
Eradicate the last vestiges of CIDR in Allocator
2015-06-10 17:24:36 +01:00
Bryan Boreham
e21f66db0a
Use address.Range instead of (start,end) pairs
2015-06-10 17:24:36 +01:00
Bryan Boreham
1e71d2dacb
Introduce new '<address_spec>' type in usage text
2015-06-10 17:24:36 +01:00
Bryan Boreham
a80e5cb028
Corrected space.Donate() to restrict the space donated to be in-range, and associated unit test changes
2015-06-10 17:24:36 +01:00
Bryan Boreham
40c9adc8d3
Extract common freelist-walking code
2015-06-10 17:24:36 +01:00
Bryan Boreham
147962d101
Clarify some unit test operations
2015-06-10 17:24:36 +01:00
Bryan Boreham
6536034ab6
Move default subnet outside of Allocator
2015-06-10 17:24:36 +01:00
Bryan Boreham
7e7a2227a0
Document multi-subnet IPAM
2015-06-10 17:24:36 +01:00
Bryan Boreham
e5113889f4
Move NumFreeAddresses() into test
2015-06-10 17:24:36 +01:00
Bryan Boreham
3cdc3522be
Don't overwrite CIDR_ARGS; write new variables ALL_CIDRS and IPAM_CIDRS
...
Handle manual CIDRs and IPAM CIDRs separately, to avoid inconsistencies and misleading messages
2015-06-10 17:24:35 +01:00
Bryan Boreham
2b4eec39cf
Support '--subnet default'
2015-06-10 17:21:16 +01:00
Bryan Boreham
3a9af4413d
Rationalize ipam arguments
...
- rename -defaultsubnet to -ipsubnet
- default subnet defaults to whole -iprange
- parse and check inside ipam package
- removes some error cases
2015-06-10 17:21:16 +01:00
Bryan Boreham
f956a76455
Tighten error checking in weave script
...
- --subnet is used but IPAM is off
- arg that comes after --subnet is not a cidr
2015-06-10 17:21:16 +01:00
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
Matthias Radestock