reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,869 Commits 7 Branches 85 Tags
0c01bb758e0b625f74cd6e00f3f11673908e6909
Commit Graph
1869 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Radestock 0c01bb758e Merge pull request #722 from errordeveloper/docs-branch-heads 
Create `weave/<branch>/head` for latest branch docs

Closes #668.
 2015-05-22 18:48:14 +01:00
Matthias Radestock f36af211c0 cosmetic 2015-05-22 15:41:29 +01:00
Matthias Radestock b20b4a8675 Merge pull request #731 from dpw/connection-select-break 
Fix use of "break" within "select" in LocalConnection actorLoop
 2015-05-22 15:40:00 +01:00
David Wragg dfa93436c2 Fix use of "break" within "select" in LocalConnection actorLoop 
From the golang spec: 'A "break" statement terminates execution of the
innermost "for", "switch", or "select" statement within the same
function.'  But the LocalConnection actorLoop seems to assume it
skips the "select" and terminates the enclosing "for".

As a result, if something did conn.Shutdown(nil), it would not actually
shutdown the connection. It turns out this is never a problem, because
Shutdown is always called with a non-nil error, even though there is code
in a few places to handle the nil case. By cleaning that up, the dubious
"break" is eliminated.
 2015-05-22 11:26:30 +01:00
Bryan Boreham 22b8f482ea Fix a couple of mistakes in get_ipam_cidr calls 
(first one only caused a slight slow-down; second one only mattered if
your 'weave' container had a non-standard name)
 2015-05-21 12:05:48 +01:00
Adam Harrison 387ec3fdd5 Add run-smoketests target to Makefile 2015-05-21 11:40:12 +01:00
Tom Wilkie 449bf45c2b Try and ignore pull request pseudo-branches for circle build. 2015-05-21 09:50:38 +00:00
Bryan Boreham f727e56bad Revert "consistency" 
This reverts commit c5d5dd5fdc.
 2015-05-21 09:54:46 +01:00
Matthias Radestock c5d5dd5fdc consistency 2015-05-21 05:46:07 +01:00
Matthias Radestock 6f68eb50aa get rid of a silly redirect 2015-05-20 16:54:07 +01:00
Paul Bellamy c63d2e531a Merge pull request #712 from errordeveloper/vagrantfile-more-cleanup 
Improve readability of Vagrantfile and cleanup this official image
 2015-05-20 16:47:28 +01:00
Ilya Dmitrichenko eb6f9faae7 Create weave/<branch>/head for latest branch docs (close #668) 2015-05-20 16:44:02 +01:00
Matthias Radestock 23dd02a05a remove redundant check 2015-05-20 15:58:22 +01:00
Paul Bellamy d24e75f76b extract vagrantfile shared bits 2015-05-20 15:42:08 +01:00
Matthias Radestock b119872b1b Merge pull request #718 from paulbellamy/proxy-check-up 
use grep in /sys to verify ethwe is up in tests

Closes #707.
 2015-05-20 13:47:48 +01:00
Paul Bellamy eeaa6c9e2c use grep in /sys to verify ethwe is up in tests 
Closes #707. `ip link show` seems to "lag" the real state. In tests
checking the physical link state is good enough.
 2015-05-20 13:36:36 +01:00
Matthias Radestock 0a7211988a Merge pull request #714 from paulbellamy/proxy-cmd-merge 
refactor proxy entrypoint rewriting to match docker daemon

Fixes #709.
 2015-05-20 13:19:03 +01:00
Paul Bellamy 369466d3d4 refactor proxy entrypoint rewriting to match docker daemon 
Closes #709
 2015-05-20 11:41:15 +01:00
Matthias Radestock f642db0462 Merge pull request #704 from bboreham/620-drop-docker 
Drop traffic from docker0 bridge to weave bridge

Fixes #620.
 2015-05-20 11:24:41 +01:00
Bryan Boreham 906be31483 Regularise the ping tests across different subnets 2015-05-20 11:08:39 +01:00
Matthias Radestock 0220f9aaca Merge pull request #713 from paulbellamy/proxy-exec 
use exec instead of run, to replace weavewait with subprocess

Closes #708.
 2015-05-20 10:48:01 +01:00
Ilya Dmitrichenko a48777e482 Clean test VMs as well 2015-05-20 10:47:15 +01:00
Bryan Boreham 4ee32cc12d Extend smoke test for new drop rule 
Note that we have to wrap the '!' in 'sh -c' to get the negation to work as expected.
 2015-05-20 10:45:18 +01:00
Paul Bellamy 818e162fff [proxy] use exec instead of run, to replace weavewait with subprocess 
Closes #708
 2015-05-20 10:35:52 +01:00
Bryan Boreham 6739e6c166 iptables rule to drop traffic from docker0 bridge to weave bridge 2015-05-20 10:27:38 +01:00
Ilya Dmitrichenko 3a0b341770 Improve readability of Vagrantfile and cleanup this official image 2015-05-20 08:24:18 +01:00
Matthias Radestock 7396f61222 move some tests 2015-05-19 21:38:50 +01:00
Matthias Radestock f7f0369bff improve logging in proxy 
- always info-log when we encounter an 'interesting' container
- s/CIDR/WEAVE_CIDR
- some other minor tweaks
 2015-05-19 19:46:53 +01:00
Matthias Radestock fe36da2041 Merge pull request #703 from paulbellamy/proxy-minimal 
proxy needs to add weavewait to execs as well
 2015-05-19 18:54:15 +01:00
Paul Bellamy 610bc46970 proxy should provide reasonable error when execing on a container which doesn't exist 2015-05-19 17:37:23 +01:00
Paul Bellamy e6b587ea8d proxy needs to add weavewait to execs as well 
Bug came up in a test where we are restarting and doing an exec checking
a network interface right away. weavewait is only added if the container
has a WEAVE_CIDR var set, the same as at container creation.
 2015-05-19 17:36:53 +01:00
Bryan Boreham 70b595c4a2 Clarify status message when allocator is awaiting consensus 2015-05-19 14:12:08 +01:00
Matthias Radestock f59facf5a6 Merge pull request #701 from bboreham/684-improve-errors 
Improve ipam error messages

Closes #684.
 2015-05-19 13:34:22 +01:00
Bryan Boreham 0e55f75d86 Oops 2015-05-19 13:16:36 +01:00
Bryan Boreham ee7dac9e28 Improve error messages 
Make clear that they come from the IP allocator, and reduce repetition in the text.
Also include the nickname for other peer, if known.
 2015-05-19 12:37:57 +01:00
Matthias Radestock 9f85cbc07d Merge pull request #696 from bboreham/692-ipam-status 
Document ipam additions to `weave status`

Closes #692.
 2015-05-19 12:05:53 +01:00
Bryan Boreham 454bbdbc68 Make reference into a link 2015-05-19 11:48:11 +01:00
Paul Bellamy 62242cb640 fixup bad golint refactor 2015-05-19 11:46:03 +01:00
Bryan Boreham 9363193fe8 Review feedback 2015-05-19 11:43:59 +01:00
Matthias Radestock 29601610c0 Merge pull request #698 from paulbellamy/proxy-minimal 
remove usage of backticks in sh script
 2015-05-19 11:33:00 +01:00
Paul Bellamy fdd0bd3b35 remove usage of backticks in bash script 2015-05-19 11:26:55 +01:00
Bryan Boreham 4d3234aa36 Merge pull request #695 from rade/merge_ipam_tests_with_rest 
LGTM
 2015-05-19 11:25:50 +01:00
Matthias Radestock 8b66b8ae47 Merge pull request #655 from paulbellamy/proxy-minimal 
Minimal implementation of the proxy

closes #47, closes #230, closes #251, closes #400.
 2015-05-19 10:59:00 +01:00
Paul Bellamy ee07d645b4 golint cleanup of else block 2015-05-19 10:47:57 +01:00
Bryan Boreham bffe9f811a Document 'weave status' section for IPAM 2015-05-19 10:41:45 +01:00
Bryan Boreham b6a8c48097 Tidy up IPAM parts of 'weave status' 
- removed detailed "free" and "owned" printout of 'space'
 - removed "free" counts from ring lines - limited usefulness and often out of date.
 - removed trailing newline
 - changed "Ring" to "Owned Ranges"
 - print subnet in CIDR format
 2015-05-19 10:38:26 +01:00
Paul Bellamy b71a428369 proxy should be sending error code to client, instead of exiting 2015-05-19 10:34:46 +01:00
Paul Bellamy 6911dc8d38 updating proxy with-dns description to match docs 2015-05-19 10:34:46 +01:00
Paul Bellamy 1e7c82bb58 use busybox instead of ubuntu for proxy image pulling test 
busybox is smaller. gliderlabs/alpine is even smaller, but is used by
weaveexec, so we can't remove it.
 2015-05-19 10:34:46 +01:00
Paul Bellamy 2f8c5d7bd9 proxy interceptors implicitly modify arguments, instead of returning them 2015-05-19 10:34:46 +01:00