Alvaro Saurin
f6ffd604dd
Removed all the imports from "code.google.com"
2015-07-02 13:32:52 +02:00
Matthias Radestock
ecfc5d091d
Merge pull request #1053 from weaveworks/437-check-address
...
Check addresses supplied by users for conflict with existing routes.
Fixes #437 . Fixes #480 .
2015-07-01 15:03:28 +01:00
Bryan Boreham
a5ddb63fca
Remove Info.Print in favour of Log.Info
2015-07-01 14:01:45 +01:00
Bryan Boreham
d82578d895
Replace logging calls with new style
2015-07-01 12:26:23 +01:00
Bryan Boreham
91099694c9
Send error message to stderr
2015-07-01 12:17:02 +01:00
Bryan Boreham
f05225da22
Check specific addresses differently to networks
...
For a network, as used by IPAM, we care if *any* address in the range
could possibly conflict with an existing address routed by the host.
When given a single address, we only care if *that specific address*
conflicts with an existing route.
2015-07-01 12:15:04 +01:00
Michael Bridgen
c0b2fe3e3b
Remove references to 'IPAM' in docs and UI
...
The option `--no-default-ipam` is replaced with
`--no-default-ipalloc`; the former will still work (in a 'last one
wins' way), but its usage message says it's deprecated.
2015-06-29 19:20:26 +01:00
Tom Wilkie
c4565f6ed3
Make proxy listen on /var/run/weave.sock
2015-06-26 15:08:21 +00:00
David Wragg
5690902173
Move DF indication into LogFrame
2015-06-25 17:11:20 +01:00
David Wragg
4162dcafd3
Make the full EthernetDecoder available to LogFrame
...
So that LogFrame can include information about the decoded frame beyond
the ethernet layer.
2015-06-25 17:11:20 +01:00
Matthias Radestock
b483be8c4b
remove the -D proxy option
...
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.
Fixes #972 .
2015-06-22 11:13:53 +01:00
Bryan Boreham
34e0e3bb24
Merge pull request #935 from bboreham/weavedns-races
...
All unit and smoke tests passed.
2015-06-17 12:05:43 +01:00
Matthias Radestock
71f19469ab
Merge pull request #947 from paulbellamy/940-proxy-default-ipam
...
[proxy] --with-ipam -> --no-default-ipam
Closes #940 .
2015-06-17 11:37:25 +01:00
Bryan Boreham
9636675c2c
Split part of DNSServer.Start() to a separate ActivateAndServe()
...
Specifically, move the part that blocks, and call that as necessary.
This means Start() can run on the caller's goroutine and avoid race conditions.
2015-06-17 11:35:53 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Matthias Radestock
c2778d9fa3
improve -neg-ttl usage message
2015-06-17 10:29:39 +01:00
Alvaro Saurin
d086867c0c
make negative TTL default to same value as TTL
2015-06-17 10:17:12 +02:00
Paul Bellamy
8873d69b77
[proxy] Add --without-dns flag, and change meaning of --with-dns flag
2015-06-16 14:07:40 +01:00
Alvaro
9284366a3d
Merge pull request #917 from bboreham/inercia-flush-sched-queue
...
Return of the Fix for the zone refresh unit test
2015-06-15 15:45:57 +02:00
Bryan Boreham
f3ad8bd52f
Merge branch 'weave-fix-unittest' of https://github.com/inercia/weave into inercia-weave-fix-unittest
2015-06-15 11:51:14 +01:00
Matthias Radestock
36ba838f54
remove ipam.DummyAllocator and rely on new SurrogateGossiper
...
As a result it is possible to mix nodes with and without IPAM. Note
that the quorum only involves the former, and hence such mixed
environments will typically require a custom `-initpeercount`.
2015-06-15 11:24:07 +01:00
Matthias Radestock
779d1589c5
Merge pull request #907 from bboreham/819-check-its-alive
...
Free allocated address if container is not running
Fixes #819 .
2015-06-12 17:22:16 +01:00
Bryan Boreham
4c01af4e1d
Check if container is still running right after allocating
2015-06-12 17:09:11 +01:00
Matthias Radestock
0f9f1feb87
Merge pull request #906 from awh/weavedns_restrict_http_listen
...
DNS HTTP API listens on eth0 only
Fixes #899 .
2015-06-12 16:56:22 +01:00
Adam Harrison
b6889ec8c3
DNS HTTP API listens on eth0 only
2015-06-12 16:55:27 +01:00
Matthias Radestock
7462fe91d5
Merge pull request #904 from bboreham/inercia-weave-821
...
Remove stale records for short-lived containers (bis)
Fixes #821 . Replaces and hence closes #865 .
2015-06-12 15:36:12 +01:00
Bryan Boreham
799e202d6d
Make error message more readable
2015-06-12 14:52:20 +01:00
Bryan Boreham
0e6569d78c
New program netcheck to check if network overlaps routes
2015-06-11 17:27:20 +01:00
Paul Bellamy
96bda1639e
define weavedns http port as a constant
2015-06-11 10:27:35 +01:00
Alvaro Saurin
2eb39d962a
Use the scheduled queue for refreshing names
...
Some minor time tweaks...
2015-06-10 22:56:40 +02:00
Alvaro Saurin
698d352322
Check with Docker whether the container is really running
2015-06-10 22:27:49 +02:00
Alvaro Saurin
1889a4a87f
Simplify the arguments passed to nameserver/http.go:ServeHTTP() (by using information found in some other objects we are already passing, like the server)
2015-06-10 22:27:49 +02:00
Alvaro Saurin
5cb2347f77
Use our own Docker client
2015-06-10 22:27:47 +02: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
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
2553850ed4
Initial implementation of multi-subnet IPAM
2015-06-10 17:21:16 +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
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
8f85a07ecc
introduce '-nodiscovery' option to disable automatic peer discovery
...
Closes #847 .
2015-06-05 15:13:48 +01:00
Paul Bellamy
b8595b9062
[proxy] cleaner default args
2015-06-05 13:23:15 +01:00
Paul Bellamy
c0cf9e509c
[proxy] Added proxy.Config struct for initialization
2015-06-05 13:23:14 +01:00
Paul Bellamy
c31358259f
[proxy] Add tls support
...
Caveats:
* TLS files must be present on the target server (and readable)
* TLS file paths cannot contain spaces
* TLS file paths must be absolute (i.e. cannot be relative)
* Bash argument parsing is terrible
2015-06-05 13:23:14 +01:00
Matthias Radestock
3a0a8ba939
cosmetic
2015-06-05 10:31:34 +01:00
Matthias Radestock
16410d6014
refactor: make encryption status part of router status
2015-06-05 10:05:17 +01:00
Paul Bellamy
e2447721eb
[proxy] We can only rely on receiving a signal when we are a container
...
Due to https://github.com/docker/docker/issues/9098 , there is no way to
signal an exec. Instead we'll have to just poll the interface and hope.
Adds `weavewait -s` which is the way to tell weavewait to skip waiting
for a signal, which we use on execs
2015-06-02 17:21:41 +01:00
Paul Bellamy
92444a75eb
[proxy] Use USR2 signal to tell weavewait when to continue
...
There was a race condition with containers running and exiting before
`weave attach` was finished, which would cause an error.
2015-06-02 15:48:49 +01:00
Matthias Radestock
5b04efac7c
move weaver
2015-06-02 14:04:02 +01:00