Matthias Radestock
1374e4c4de
ditch RunWithTimeout test helper
...
It breaks stack traces on failure.
We can just rely on running `go test -timeout ...` instead, which we
already do in tools/test.
2015-12-09 13:20:57 +00:00
Matthias Radestock
0ef57a102f
cosmetic: remove unnecessary comment
2015-12-09 12:37:53 +00:00
Adam Harrison
1c7954a43d
Merge pull request #1728 from weaveworks/1676-ipam-plugin
...
Docker IPAM plugin
2015-12-09 11:07:46 +00:00
Matthias Radestock
be1dc8ef96
Merge branch '1.3'
2015-12-09 10:34:52 +00:00
Matthias Radestock
18fc6ccc03
remove redundant code in test
2015-12-09 10:32:14 +00:00
Matthias Radestock
7ec46983aa
Merge branch '1.3'
2015-12-08 23:08:35 +00:00
Matthias Radestock
eddcf93942
oops
2015-12-08 23:08:19 +00:00
Matthias Radestock
42807f7b8a
Merge branch '1.3'
2015-12-08 23:07:06 +00:00
Matthias Radestock
0b521272ae
prevent peer duplication in tests
...
and correct the test assertions accordingly - they make more sense
now.
Fixes #1766 .
2015-12-08 23:06:02 +00:00
Bryan Boreham
ecd93bbfe4
Resolve weave IP every time we need it, in case it changed
2015-12-08 16:59:34 +00:00
Bryan Boreham
a6f07fbaac
Move baseUrl usage up to httpVerb
2015-12-08 16:59:34 +00:00
Bryan Boreham
f87876c1c3
Fetch the default subnet from weave to use as the ipam driver 'pool'
2015-12-08 16:59:34 +00:00
Bryan Boreham
ec3de1a072
Introduce ipam plugin
2015-12-08 16:59:32 +00:00
Bryan Boreham
c1d2c159f0
Expand listener skeleton to support IPAM driver
2015-12-08 16:58:55 +00:00
Bryan Boreham
9f86e2ba43
Moved net plugin to its own directory
2015-12-08 16:58:53 +00:00
Adam Harrison
d0be36dc9b
Merge branch '1.3'
...
Conflicts:
Makefile
2015-12-08 16:53:47 +00:00
Adam Harrison
af604a1477
Merge pull request #1760 from weaveworks/make-test-tls
...
Move test/tls program into Makefile so it builds inside the build container
2015-12-08 16:41:59 +00:00
Bryan Boreham
c981cff450
Move build of test/tls program into Makefile so it builds in the build container
2015-12-08 16:14:53 +00:00
Bryan Boreham
ab1033c26c
Merge pull request #1736 from weaveworks/remove-unknown-peer-error
...
remove UnknownPeerError for quicker convergence and efficiency. LGTM.
2015-12-04 11:00:05 +00:00
Adam Harrison
01706df7c8
Merge pull request #1753 from weaveworks/1751-remove-unused-vars
...
remove CLIENT_TLS_ENABLED and DOCKER_CLIENT_TLS_VERIFY, as they're unused
2015-12-04 10:19:09 +00:00
Adam Harrison
827a7c1cf1
Merge branch '1.3'
2015-12-04 10:09:15 +00:00
Adam Harrison
d14d9933b4
Merge pull request #1750 from weaveworks/add-some-quotes
...
quote $@
2015-12-04 10:08:34 +00:00
Adam Harrison
af946893f0
Merge pull request #1749 from weaveworks/remove-eqeq-non-posixism
...
'==' is not POSIX
2015-12-04 10:08:26 +00:00
Paul Bellamy
245ae5e987
remove CLIENT_TLS_ENABLED and DOCKER_CLIENT_TLS_VERIFY, as they're unused
2015-12-02 17:17:04 +00:00
Matthias Radestock
29f3d711c6
Merge branch '1.3'
2015-12-02 15:34:07 +00:00
Matthias Radestock
3909936cc8
cosmetic(ish) use PROXY_PORT
2015-12-02 15:33:38 +00:00
Matthias Radestock
0602c91c54
quote $@
2015-12-02 15:28:41 +00:00
Matthias Radestock
a7bdb02a2b
Merge remote-tracking branch 'upstream/master'
2015-12-02 14:33:28 +00:00
Matthias Radestock
2cfaf5a119
Merge branch '1.3'
2015-12-02 14:23:28 +00:00
Matthias Radestock
20a48f05b3
fix (harmless) typo
2015-12-02 14:22:23 +00:00
Matthias Radestock
4e70fb7f9d
'==' is not POSIX
2015-12-02 14:20:29 +00:00
Adam Harrison
1f438dbf71
Merge pull request #1740 from weaveworks/1694-symlink-into-var-run-2
...
Symlink sockets to /var/run/weave/weave.sock from inside the proxy
2015-12-02 14:12:02 +00:00
Adam Harrison
619d0e2bdd
Merge pull request #1730 from weaveworks/1725-plugin-dns
...
Fix DNS integration in Weave docker plugin
2015-12-02 09:49:21 +00:00
Bryan Boreham
ec420c66d4
Review feedback
2015-12-01 16:47:47 +00:00
Paul Bellamy
ac1cf633c7
clarify some variable shadowing
2015-12-01 16:16:39 +00:00
Paul Bellamy
6f25d2170d
[proxy] have symlinking respond to WEAVE_DEBUG not DEBUG
2015-12-01 15:51:16 +00:00
Paul Bellamy
295a2ced32
[proxy] treat addrs prefix with / as unix addrs
2015-12-01 15:45:32 +00:00
Matthias Radestock
cbb2ad018d
don't broadcast-gossip other peer when adding a connection
...
This is more efficient since broadcasting about other peers is
strictly redundant. Any change to the peers will be broadcast by
those peers anyway. And SendAllGossipDown takes care of informing new
peers about others on first connect, and periodic gossip take care of
missed broadcasts.
The only reason we did broadcast about the remote peer is to reduce
the liklihood of UnknownPeerError and the associated throwing away of
gossip. This was always a bit of kludge, and is no longer necessary
since UnknownPeerError is gone.
Now peers only ever broadcast information about themselves. Which,
unlike information about other peers, is always authorative and most
up-to-date. Which is nice.
2015-12-01 13:10:06 +00:00
Matthias Radestock
7e15eabe65
remove UnknownPeerError
...
when encountering an unknown peer in received gossip, rather than
ignoring the entire gossip we create a placeholder Peer. This has
version 0 and uid 0, which means it will be replaced by any complete
peer information subsequently received via gossip.
2015-11-30 16:17:16 +00:00
Bryan Boreham
eb9b5b535f
Merge branch '1.3'
2015-11-30 16:16:09 +00:00
Bryan Boreham
a13351a9eb
Merge pull request #1712 from weaveworks/issues/1577-interpose-bridge-netdev
...
Optional intermediary bridge netdev. Fixes #1577 .
2015-11-30 15:54:14 +00:00
Bryan Boreham
74fdf6beec
Merge pull request #1732 from weaveworks/1731-merge-peer-has-short-id
...
update Peer.HasShortID as part of topology merge
Fixes #1731
2015-11-30 15:53:23 +00:00
Paul Bellamy
cd7c88e5a5
[proxy] Symlink sockets to /var/run/weave/weave.sock from inside the proxy
...
We copy docker.sock owner to symlinks. Permissions are not copied,
because the permissions will inherit from the target.
use versioned exec image to create symlinks
2015-11-30 15:45:30 +00:00
Bryan Boreham
a22b88ed89
Track endpoints so we can register the right address with DNS
2015-11-30 14:27:33 +00:00
Bryan Boreham
5eb99fe5ef
Get container IP for various networks
2015-11-30 14:27:33 +00:00
Bryan Boreham
85e465cfa4
Eliminate 'dockerer'
2015-11-30 14:27:33 +00:00
Bryan Boreham
e101dde62e
Extract 'api' package
2015-11-30 14:27:33 +00:00
Adam Harrison
1980ffea30
Merge pull request #1702 from weaveworks/issues/1639-ipam-diagnostics
...
Show some IPAM stats with `weave status ipam`
2015-11-30 14:20:13 +00:00
Adam Harrison
0935e0a13d
Merge branch '1.3'
2015-11-30 14:09:44 +00:00
Adam Harrison
b2b68119fc
Merge pull request #1719 from weaveworks/issues/1653-make-dir
...
Ensure /var/run/weave directory exists before telling Docker to use it
2015-11-30 13:57:37 +00:00
Matthias Radestock