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
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
Adam Harrison
4420057d4f
Merge pull request #1716 from weaveworks/issues/1714-complete-addr-1.3
...
Ensure `weave connect` attempts connection immediately
2015-11-30 13:52:13 +00:00
Bryan Boreham
bd2b8df7c5
Refactor to use Weave's docker client and watcher
2015-11-30 13:25:20 +00:00
Matthias Radestock
068bbe0837
Merge branch '1.3'
2015-11-30 13:19:21 +00:00
Bryan Boreham
7e0e1fbaad
Adjust formatting after review feedback; hostnames up to 14 chars will now align
2015-11-30 12:07:59 +00:00
Bryan Boreham
9723476392
Merge pull request #1708 from weaveworks/gce-connect-fix
...
Connect to gce boxes as vagrant so we can access docker unix socket
2015-11-30 11:45:30 +00:00
Matthias Radestock
9dee2f2230
update Peer.HasShortID as part of topology merge
...
This was missing.
There are two parts to this change:
1. updating the Peers.byName mapping when HasShortID changed (in
addition to the existing update on ShortID change). We need to be
careful about the sequencing here - both ShortID and HasShortID must
be set between the calls to deleteByShortID and addByShortID, since
the former is meant to delete the existing entry (hence use the old
values) and the latter add the new entry (hence use the new values).
2. update a peer when the received info has the same version and UID
but the current record has HasShortID=false, and the received info has
HasShortID=true. This caters for the case where we receive an update
about a weave 1.2+ peer first via a pre-1.2 peer (which does not
transmit ShortIDs, and always sets HasShortID=false) and subsequently
via a 1.2+ peer. The former update will force us to communicate with
that peer over the 'sleeve' overlay. We want to accept the latter
update, even though the version is the same, in order to update the
ShortID and HasShortID, so we can switch to fastdp.
Fixes #1731 .
2015-11-29 16:32:50 +00:00
Matthias Radestock
175f38414e
cosmetic
2015-11-28 20:15:57 +00:00
Bryan Boreham
8bbf8231d2
Show which range is being allocated in weave report
2015-11-26 17:24:41 +00:00
Bryan Boreham
2fbbb802bd
Don't assert invariants when printing status
...
- if it's broken you might appreciate being able to print it out
2015-11-26 17:24:41 +00:00
Bryan Boreham
cb65a80dce
Reworded IPAM service description in weave status
...
following review in #1702
2015-11-26 17:24:41 +00:00
Bryan Boreham
3a9bcbcf6b
Remove specialised knowledge of IPAM from weave status formatter
...
and unnecessary info from `weave report` output
2015-11-26 17:24:40 +00:00
Bryan Boreham
e38018ab1e
Add warning to main ipam status if all IPs owned by unreachable peers
2015-11-26 17:23:49 +00:00
Bryan Boreham
044c6474b2
Remove counting of ring tokens, since it isn't useful to end-user.
...
Previously the count of tokens was claimed to be a count of addresses in use,
which is incorrect.
Also rename `appendAddresses` to `appendOwned` since it doesn't involve addresses.
2015-11-26 17:23:49 +00:00
Bryan Boreham
5f42a4d95e
Hold stats by peer identity not nickname
...
so we can print the peer name for each ownership.
Also avoid crashing if we don't own anything
2015-11-26 17:23:49 +00:00
Bryan Boreham
6d3fd6da07
Simplify ipam status format
...
Don't use the word "universe" in user-visible output; it is an internal term.
Removed everything but owned ranges from 'weave status ipam' results, for consistency with similar functions
2015-11-26 17:23:49 +00:00
Alvaro Saurin
34e7996f2f
Show some IPAM status at /status/ipam
2015-11-26 17:23:47 +00:00
Bryan Boreham
f2d7a28258
Add docker plugin README
2015-11-26 17:18:59 +00:00
Adam Harrison
ba6f8da1e4
Merge pull request #1670 from weaveworks/issues/1634-block-6783-6784
...
Forbid traffic to the Weave port from containers
2015-11-26 16:52:34 +00:00
Adam Harrison
0a5e79891d
Merge pull request #1724 from weaveworks/1674-move-plugin
...
Move Weave docker plugin into this repo
2015-11-26 15:34:15 +00:00
Bryan Boreham
901bf63cb8
Fix printf error caught by lint
2015-11-26 15:19:57 +00:00
Bryan Boreham
350b8efb0b
Move Weave docker plugin into this repo
2015-11-26 14:40:28 +00:00
Adam Harrison