Matthias Radestock
0bdc84d42a
Merge branch '1.1'
2015-09-22 16:28:05 +01:00
Matthias Radestock
7f74ae7912
Merge pull request #1426 from weaveworks/1418-clean-cancel
...
Handle cancelled allocation in 'weave attach'
Fixes #1418 .
2015-09-22 16:27:27 +01:00
Bryan Boreham
98b80c59d9
Detect cancelled allocation more cleanly
...
to avoid the weave script trying to parse an error message as a CIDR
2015-09-16 14:14:40 +01:00
Matthias Radestock
14dde9ec32
Merge branch '1.1'
2015-09-15 16:47:05 +01:00
Bryan Boreham
d55c68c248
Review feedback
2015-09-15 16:18:37 +01:00
Bryan Boreham
a7e0f03647
Use explicit index into operations slice in cancelOpsFor()
...
to avoid mis-indexing when more than one op is removed
2015-09-14 17:02:35 +01:00
Bryan Boreham
81e8ba223f
Do network attach on docker event rather than intercepting start and restart commands.
...
This means it also works when the docker daemon restarts a container.
2015-09-01 17:48:12 +01:00
Adam Harrison
fc9a1c8664
new weave status, weave status ..., and weave report
2015-08-11 12:15:13 +01:00
Matthias Radestock
77358140d9
Merge pull request #1219 from squaremo/driveby
...
Remove misleading comment and lowercase deniedBy
2015-07-28 18:09:01 +01:00
Tom Wilkie
da7ac78694
Don't try and init the ring if the IP address is not in our range.
2015-07-28 14:12:42 +00:00
Michael Bridgen
c88361473c
Remove misleading comment and lowercase deniedBy
...
* the comment "don't make the caller wait" applies to both branches
of that if clause, and having it on one branch implies the other
does make the caller wait
* there's no reason for DeniedBy to start with a capital: it's a
method on a private struct and it's not part of an interface.
2015-07-27 16:22:32 +01:00
Bryan Boreham
f0915221d1
Rename 'reclaim' to 'noErrorUnknown' which describes the behaviour better
2015-07-23 20:16:30 +01:00
Bryan Boreham
647b755b64
Check manually-assigned addresses with IPAM to see if they clash
2015-07-21 17:02:52 +01:00
Tom Wilkie
25c9180fdf
Don't swallow errors in the docker client.
2015-07-17 12:35:12 +00:00
Matthias Radestock
358ae3a936
Merge pull request #1174 from weaveworks/1128-iprange-error
...
More helpful error message when --ip-alloc-range mismatched
Closes #1128 .
2015-07-17 12:35:20 +01:00
Bryan Boreham
1f4b943454
More helpful error message when --ip-alloc-range mismatched
2015-07-17 11:42:30 +01:00
Bryan Boreham
f4d6e028d4
Simplify
2015-07-17 11:33:29 +01:00
Bryan Boreham
2d224d423d
Add SpaceRequestDenied message
2015-07-16 16:12:23 +01:00
Bryan Boreham
e7088e5daf
Extract decodeRange function
2015-07-16 16:12:23 +01:00
Bryan Boreham
b3979c9505
Respond to paxos message if we already have a ring
2015-07-15 13:05:25 +01:00
Bryan Boreham
acf13dc157
Add sender to OnGossipBroadcast()
2015-07-15 12:07:56 +01:00
Adam Harrison
d5a4326b9e
Merge branch '1.0'
...
Conflicts:
ipam/allocator_test.go
ipam/claim.go
2015-07-10 14:35:41 +01:00
Bryan Boreham
cf4ce0a07d
Don't cancel address claim when caller closes socket
2015-07-09 10:47:34 +01:00
Tom Wilkie
4fdb14293b
Move ipam/address to net/address
2015-07-07 10:33:20 +00:00
Bryan Boreham
d82578d895
Replace logging calls with new style
2015-07-01 12:26:23 +01:00
Bryan Boreham
9f784b3c31
Report errors in unicasting gossip
2015-06-25 12:22:53 +01:00
Matthias Radestock
0b3584a355
permit encoding of GossipData into multiple messages
2015-06-15 11:14:24 +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
e9d194327a
Reduce level of noise in debug logs from containers dying
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
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
6536034ab6
Move default subnet outside of Allocator
2015-06-10 17:24:36 +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
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
a617e7918c
Introduce single-address Free() and rename the previous one to Delete()
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
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
2a244e5699
Simplify paxos.Consensus() call
2015-06-04 13:30:15 +01:00
Adam Harrison
4a8850afb3
Fix comment
2015-06-03 12:08:13 +01:00
Michael Bridgen
791584d9f3
Allow lookup of IPAM-allocated addresses
2015-06-02 17:31:25 +01:00
Bryan Boreham
2698f3f376
Merge remote-tracking branch 'upstream/0.11'
2015-06-01 11:42:30 +01:00
Bryan Boreham
cd1cca3df2
Reformat output of pending ipam requests
2015-06-01 10:55:01 +01:00
Bryan Boreham
1d6f1f7561
Improve ipam status message before and after pending consensus
2015-05-29 17:34:17 +01:00
Matthias Radestock
5920927a52
make the linter (almost) happy with ipam
2015-05-27 16:43:18 +01:00
Matthias Radestock