Bryan Boreham
776ccac00a
Pin docker API version to 1.21
2015-12-15 16:52:30 +00:00
Bryan Boreham
1539009362
Simple smoke-test for 'local' plugin network
2015-12-15 16:47:33 +00:00
Bryan Boreham
9542b77a34
Extend smoke-test framework for weaveplugin
2015-12-15 16:47:33 +00:00
Bryan Boreham
b709cdeab5
Create local and global network from the same driver and create local-scope weave network by default on weave launch
2015-12-15 16:47:18 +00:00
Bryan Boreham
e2f936fde3
Rework version check
...
- extract function so we can use the check elsewhere
- use shell variable expansion rather than exec-ing 'cut'
2015-12-15 16:40:43 +00:00
Bryan Boreham
a4ca389f2e
Make the plugin scope (local or global) an option
2015-12-15 16:31:07 +00:00
Bryan Boreham
c973808b20
Merge pull request #1758 from weaveworks/issues/82-optional-encryption
...
Make encryption optional; fixes #82 , #1788 . LGTM.
2015-12-15 15:23:58 +00:00
Adam Harrison
e12dbb4605
Disable pcap optimisation of encrypted sleeve
...
Prior to optional encryption support, enabling encryption disabled the
fast datapath overlay (because it doesn't support encryption) but left
the OVS datapath netdev in place for bridging (so that users could
switch encryption on and off without resetting the bridge). In this
situation the ODP miss handler is guaranteed to be invoked for every
packet, so as an optimisation the weave script configured the router to
use pcap to capture packets from the bridge as that is slightly more
efficient. The introduction of optional encryption means the guarantee
no longer holds, and so the optimisation must be removed.
2015-12-15 14:51:21 +00:00
Bryan Boreham
d1ba4ab7f4
Merge pull request #1755 from weaveworks/issues/1741-weave-no-multicast-route
...
Add options to disable multicast route - LGTM; fixes #1741
2015-12-15 10:17:09 +00:00
Adam Harrison
85d4b1f137
Smoke test trusted subnets
2015-12-14 12:13:16 +00:00
Adam Harrison
b9792f8f96
Document trusted subnets
...
Update features and troubleshooting markdown.
2015-12-14 12:13:16 +00:00
Adam Harrison
e0cb9cf24d
Restore leading whitespace to weave status
2015-12-14 12:13:16 +00:00
Adam Harrison
4e41d4d451
Add trusted subnets to weave status
...
`weave status` now displays the list of specified trusted subnets, and
`weave staus connections` shows the encryption state of individual
connections.
2015-12-14 12:13:16 +00:00
Adam Harrison
059cc65b55
Fallback to encrypted sleeve on a per-connection basis
...
If overlay encryption is required between peers, the fast datapath
forwarder returns an error rather than aborting the process, allowing
the overlay switch to fall back gracefully to an encrypted sleeve
overlay connection.
2015-12-14 12:13:11 +00:00
Adam Harrison
d434b50dfc
Include trust level in features exchange
...
Add a 'Trusted' feature to the protocol exchange which indicates whether
the remote considers us to be reachable via a secure network; overlay
encryption will be disabled in the event that both peers agree. For
backwards compatibility purposes a default value of untrusted is assumed
if the feature is missing.
2015-12-14 12:12:25 +00:00
Adam Harrison
96f69583e7
Smoke test --no-multicast-route
2015-12-14 11:53:06 +00:00
Adam Harrison
ce25f58639
weave launch-proxy accepts --no-multicast-route
2015-12-14 11:53:06 +00:00
Adam Harrison
367b73e6e3
Introduce nomcast weavewait
2015-12-14 11:53:06 +00:00
Adam Harrison
98a7d3fc99
weave run and weave attach accept --no-multicast-route
2015-12-14 11:53:06 +00:00
Bryan Boreham
b51b1adfcd
Merge pull request #1767 from weaveworks/1765-test-gossip-surrogate-failure
...
better emulation of connections in gossip tests. Fixes #1765 .
2015-12-11 17:20:23 +00:00
Matthias Radestock
ab902b45aa
refactor: introduce a helper to reduce duplication
2015-12-10 10:56:18 +00:00
Matthias Radestock
ed14561afd
refactor: rename
2015-12-10 10:54:20 +00:00
Matthias Radestock
86d2db5cc2
better emulation of connections in gossip tests
...
real Connections do not process gossip until after AddConnection.
mockChannelConnection wasn't behaving in that way, which resulted in
some sporadic test failures since it would cause some gossip to get
processed too early, which in turn would trigger gc of some of the
just-received peers, which we would then find missing in the test
assertions.
To fix this we introduce a latch on mockChannelConnection which closes
when the remote end is ready to receive gossip. Effectively this
emulates the entering of LocalConnection.receiveTCP after the call to
AddConnection completes.
Unfortunately an open latch will cause sendPendingGossip to block. We
get around that by abandoning checks in "half-connected" connection
states.
Fixes #1765 .
2015-12-10 10:54:10 +00:00
Bryan Boreham
700851cdd5
Add a note about connecting up peers
2015-12-10 10:40:48 +00:00
Adam Harrison
c3e1f5a6c6
.gitignore tls binary
2015-12-10 10:08:04 +00:00
Bryan Boreham
9bf18b1761
Merge pull request #1769 from weaveworks/ditch-run-with-timeout
...
Wins the prize for "best add-to-delete ratio in a PR this year"
2015-12-09 13:56:54 +00:00
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
Bryan Boreham