Matthias Radestock
0abfdf4efb
Merge branch '1.5'
2016-06-17 15:07:34 +01:00
Matthias Radestock
b014de3f08
Merge pull request #2382 from weaveworks/issues/2379
...
Fix Docker 1.12 incompatibilities
Fixes #2379 .
2016-06-17 15:06:55 +01:00
Bryan Boreham
56c275a9bf
Copy Docker's response code through for raw stream.
...
This means when Docker says "101 UPGRADED" the proxy will say the
same, instead of "200 OK". Docker 1.12 barfs if you do that.
2016-06-17 13:07:04 +01:00
Bryan Boreham
ddd039761d
Handle Docker daemon named 'dockerd'
2016-06-17 13:05:35 +01:00
Adam Harrison
f4798fadf8
Merge pull request #2374 from weaveworks/issues/1726-plugin-arp
...
Perform arp configuration for plugin-connected containers
2016-06-17 10:19:53 +01:00
Bryan Boreham
adda1c459c
Fix plugin filter - truncate Docker ID to 12 chars
2016-06-16 18:03:45 +01:00
Matthias Radestock
979df93bff
Merge pull request #2378 from weaveworks/issues/2364-observe-resolv-conf
...
Observe resolv.conf changes
Fixes #2364 .
2016-06-16 17:13:10 +01:00
Adam Harrison
27e7ec08d4
Observe resolv.conf changes
2016-06-16 16:55:40 +01:00
Adam Harrison
c6a777c4b0
Merge pull request #2366 from weaveworks/issues/2189-publish-weavedb
...
Publish weavedb container from release script
2016-06-16 11:03:27 +01:00
Bryan Boreham
7182ec0463
Merge pull request #2338 from weaveworks/awsvpc-docs
...
awsvpc docs
2016-06-15 16:59:54 +01:00
Bryan Boreham
425f17aab1
Mention that 'weave launch' now waits
2016-06-15 16:58:05 +01:00
Bryan Boreham
3494cc39c1
Expand description surrounding link to awsvpc mode
2016-06-15 16:58:05 +01:00
Bryan Boreham
2face0f318
Publish weavedb container from release script
2016-06-15 15:50:37 +01:00
Bryan Boreham
bb203a2d18
Merge branch '1.5'
2016-06-15 13:50:47 +01:00
Bryan Boreham
95b42a532a
Merge pull request #2367 from weaveworks/issues/2290-own-image
...
Use our own ubuntu image
2016-06-15 13:50:26 +01:00
Bryan Boreham
08e2c5c14e
Fix link for 'docker run' docs
2016-06-15 13:48:25 +01:00
Bryan Boreham
a4f3e763bb
Use our own ubuntu image
2016-06-15 13:47:20 +01:00
Bryan Boreham
06feefe80f
Merge branch '1.5'
2016-06-15 11:12:12 +01:00
Bryan Boreham
3dd7e13cc0
Merge pull request #2369 from weaveworks/issues/2335
...
Describe creating multiple networks using the plugin
2016-06-15 11:11:25 +01:00
Bryan Boreham
fdf3afa935
Review feedback
2016-06-15 11:10:13 +01:00
Bryan Boreham
8bb8f70bb6
Perform arp configuration for plugin-connected containers
2016-06-14 17:53:34 +01:00
Bryan Boreham
c71c630cf6
Use driver name to detect 'our' endpoints
...
so we don't have to remember all the endpoint IDs, or load them up
after a restart.
2016-06-14 17:52:45 +01:00
Matthias Radestock
179b6f7cf9
Merge pull request #2368 from weaveworks/small-doc-fixes
...
Small doc fixes
2016-06-14 16:26:17 +01:00
Martynas Pumputis
73a393823a
Merge pull request #2370 from weaveworks/awsvpc-clashes
...
Report a couple of options that are incompatible with --awsvpc
2016-06-14 10:12:37 +01:00
Bryan Boreham
b32da8d69f
Report a couple of options that are incompatible with --awsvpc
2016-06-13 16:53:27 +01:00
Bryan Boreham
b993fd67ab
Describe creating multiple networks using the plugin
2016-06-13 16:49:55 +01:00
Bryan Boreham
e9770740d8
Use short name rather than long hex ID
2016-06-13 16:20:32 +01:00
Bryan Boreham
7abed164eb
Clean up reference to 'above'
2016-06-13 16:11:01 +01:00
Matthias Radestock
7a1bd27a58
Merge branch '1.5'
2016-06-13 15:24:49 +01:00
Matthias Radestock
aca34191da
Merge pull request #2365 from weaveworks/issues/2283-validate-cidrs
...
Validate CIDRs in proxy before attaching a container
Fixes #2283
2016-06-13 15:15:48 +01:00
Martynas Pumputis
df5508c0f3
Check CIDRs before attaching a container in proxy
...
If any cidr is invalid, a user will get the following error:
"docker: Error response from daemon: invalid WEAVE_CIDR: $CIDR".
2016-06-13 14:54:16 +01:00
Bryan Boreham
e63fd0b38f
Merge branch '1.5'
2016-06-13 12:00:46 +01:00
Bryan Boreham
47878cf5b6
Merge pull request #2362 from weaveworks/checkpoint-doc
...
Re-instate mention of checkpoint on install page
2016-06-13 11:13:16 +01:00
Anita Buehrle
f0ea18171b
tweaked the sentence a little
2016-06-13 10:57:35 +01:00
Bryan Boreham
aa3f40ec8d
Re-instate mention of checkpoint on install page lost in d1e004dedc
2016-06-13 10:57:19 +01:00
Bryan Boreham
bf8c8833e5
Merge pull request #2356 from weaveworks/issues/2322-awsvpc-enhance
...
Transfer IPAM ranges to UnknownPeer if no peer is found during Shutdown
2016-06-10 14:00:36 +01:00
Martynas Pumputis
8569cbd4a3
Force transferring of IPAM ranges in a case of Shutdown
...
If no peer for transfer is found, we transfer them to
mesh.UnknownPeerName to notify the ring update tracker.
Makes the awsvpc tracker to remove local entries from
the VPC route table when the last peer calls "weave reset".
2016-06-10 11:51:31 +01:00
Adam Harrison
adcb1018df
Merge pull request #2345 from weaveworks/issues/2344-persist-more
...
Fix ring persistence after free space update
2016-06-09 16:37:57 +01:00
Adam Harrison
f4b9a9b66c
Merge pull request #2352 from weaveworks/issues/2318-moar-help
...
Print usage on --help argument to any command
2016-06-09 16:02:35 +01:00
Bryan Boreham
52d911c8c1
Merge branch '1.5'
2016-06-09 13:06:41 +00:00
Bryan Boreham
d1314dd248
Fix broken link
2016-06-09 13:05:39 +00:00
Bryan Boreham
5db7a2bae1
Print usage on --help argument to any command
2016-06-09 12:44:37 +00:00
Bryan Boreham
71540e6c6d
Clarify IAM role and policy
2016-06-09 10:41:34 +00:00
Anita Buehrle
3c45ba09f9
A few edits to improve awsvpc docs.
...
Fixed up the notes with spaces and bolding
Fixed some awkwardness in first paragraph
Fixed a couple of other sentences
2016-06-09 10:40:46 +00:00
Bryan Boreham
cf87a84bd9
Merge pull request #2341 from weaveworks/issues/2017-awsvpc
...
Add AWSVPC. Fixes #2017
2016-06-08 17:24:55 +01:00
Bryan Boreham
c77b2e8fb3
Tell the proxy that multicast is off in awsvpc mode.
...
Otherwise it will use the regular weavewait program which wait for the
multicast route to be added.
2016-06-08 16:44:54 +01:00
Bryan Boreham
37fd54f20b
Perform AWSVPC checks for attach in script rather than in weaveutil
2016-06-08 16:44:54 +01:00
Martynas Pumputis
fb9b4ddec0
Enable AWSVPC
...
This requires the following additional steps:
- Setting proxy_arp on on the bridge, because that's how we do
the routing (check the comment at the place where we set it on).
- Disable ARP requests queueing, because it introduces unnecessary
delay for the first ARP request resulting in a high latency of
the first packet (on t2.micro machines I've encountered ~700ms
latency). Also, the queue is bounded, so we might risking to drop
the requests.
2016-06-08 16:44:54 +01:00
Martynas Pumputis
7670fed72c
Add AWSVPC setup routines to the attach script
...
When running in the AWSVPC mode, we need to do the following:
- Keep the HW TX offloading on.
- Check that the allocated address belongs to the default subnet,
because only one subnet is allowed and it should be the default one.
If it is not possible to determine whether AWSVPC is on, we ignore
all the steps, because the attachment routines have to work
regardless whether the router is running and the AWSVPC detection
is done by querying the /ipinfo/tracker endpoint served by
the router.
2016-06-08 16:44:54 +01:00
Martynas Pumputis
de2a70861c
Add GET /ipinfo/tracker
...
The endpoint returns the name of tracker. It is used to determine
whether the router is running a tracker.
2016-06-08 16:44:54 +01:00