reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,491 Commits 7 Branches 85 Tags
65cd2b0e04a7a7ff2724913411eec920ee8f6f7d
Commit Graph
402 Commits
Author SHA1 Message Date
Matthias Radestock a3db33cfd9 more helpful error message when weave et al die on startup 
Closes #958.
 2015-06-17 22:54:11 +01:00
Paul Bellamy ca681bce13 [proxy] Add support for WEAVE_CIDR=none 
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
 2015-06-17 14:51:12 +01:00
Bryan Boreham ff838a14d9 Fix terminology in error message. 
Also removed hint on usage, because `-iprange` is on by default.
 2015-06-17 13:16:53 +01:00
Paul Bellamy b1f43f0d7c [proxy] Remove spurious output from proxy-(env|config) 
`docker log` outputs an error if stdout is closed before it is done, so
silence that
 2015-06-17 11:53:28 +01:00
Paul Bellamy 220c80c3ed [proxy] --with-ipam -> --no-default-ipam 2015-06-17 11:31:33 +01:00
Adam Harrison b8afefa55f Merge pull request #931 from paulbellamy/weavedns_default_search_domain 
[dns] resolve names in `weave.local` by default unless hostname or search path is specified
 2015-06-16 18:13:17 +01:00
Bryan Boreham ee4daf02b5 Introduce ipam_cidrs_or_die, and call it where we don't want the 
container to survive an ipam failure.
 2015-06-16 15:27:49 +01:00
Paul Bellamy 2c3baa9119 use weavedns search-domain by default 
iff no hostname/dns-search specified
 2015-06-16 15:13:19 +01:00
Bryan Boreham 32d3909023 Make ipam_cidrs() return failure when call_weave fails 2015-06-16 14:47:47 +01:00
Adam Harrison fdce84d9d9 New --with-dns/--without-dns behaviour in weave script 2015-06-16 14:07:42 +01:00
Paul Bellamy 8873d69b77 [proxy] Add --without-dns flag, and change meaning of --with-dns flag 2015-06-16 14:07:40 +01:00
Bryan Boreham 79db00a90e Strip trailing period from hostname generated from weavedns domain. 
We strip at the calling point rather than in the server, because DNS
servers do see the domain as ending with a '.'  representing the root.
 2015-06-16 10:26:11 +01:00
Matthias Radestock 0206434f62 fix 130_expose_test breakage 
introduced by 8ac98f9f6b
 2015-06-15 22:25:22 +01:00
Matthias Radestock 657cbaefb9 refactor: simplify dns_args 2015-06-15 21:54:51 +01:00
Matthias Radestock cba1827d2c Merge pull request #918 from bboreham/916-check-call-weave 
Output error message if http call to weave or weavedns fails

Fixes #916.
 2015-06-15 21:16:40 +01:00
Matthias Radestock 3d7c18ee70 cosmetic: remove some unnecessary quoting 2015-06-15 21:02:23 +01:00
Matthias Radestock 82c1a58e81 refactor: remove unused weave dns-domain command 
and inline dns_domain() function.

Both were introduced in #890.
 2015-06-15 19:23:52 +01:00
Matthias Radestock 8ac98f9f6b tiny refactor: replace some 'if's with short-circuit expressions 2015-06-15 18:33:29 +01:00
Bryan Boreham 56e0636b14 Output error message if http call to weave or weavedns fails 2015-06-15 17:58:59 +01:00
Matthias Radestock ec85da914a simplify dns-add/remove arg checking 2015-06-15 10:34:59 +01:00
Matthias Radestock 72640f1828 refactor: extract helpers for http calls into weave and weavedns 2015-06-14 17:46:56 +01:00
Matthias Radestock bf4c75b1cd don't validate -iprange value 
We generally don't validate arguments in the script unless we process
them there.
 2015-06-14 16:12:53 +01:00
Matthias Radestock 313a95a467 let -iprange "" start the router w/o IPAM 2015-06-14 16:06:20 +01:00
Matthias Radestock 926c85c6ba more idiomatic 'boolean' in shell 2015-06-14 15:48:08 +01:00
Matthias Radestock eae9928e98 don't complain when weave --local run is invoked without args 
leave that to docker, same as we do for `weave run`

Fixes #910.
 2015-06-13 00:48:01 +01:00
Adam Harrison b6889ec8c3 DNS HTTP API listens on eth0 only 2015-06-12 16:55:27 +01:00
Bryan Boreham 12de13c678 Use /10 instead of /9 for default iprange, so it doesn't clash with CircleCI address 2015-06-12 15:15:36 +01:00
Matthias Radestock 727a213ba1 permit weavedns IP addresses to be choosen by IPAM 
Same as for ordinary containers.

Closes #762.
 2015-06-12 13:50:22 +01:00
Bryan Boreham 328e63828e Check whether netcheck exists before relying on it 2015-06-11 17:55:27 +01:00
Bryan Boreham 465b16e668 Give -iprange a default, and check if it is free 2015-06-11 17:34:43 +01:00
Matthias Radestock 8e04b135bb check that nsenter is present 
for `weave --local ...`

Closes #895.
 2015-06-11 16:37:28 +01:00
Matthias Radestock 2b7c785386 don't output container id when we kill it 
This was missed from #831.
 2015-06-11 16:34:46 +01:00
Matthias Radestock e96cde1872 Merge pull request #890 from awh/use_container_name_as_hostname 
Use container name as hostname

Closes #750.
 2015-06-11 12:35:46 +01:00
Adam Harrison 35cfafc319 Defer evaluation of $(dns_domain) until necessary 2015-06-11 11:52:33 +01:00
Matthias Radestock e1c07dce3f permit overriding of DOCKERHUB_USER 
which in turn enables operation from private registries

Closes #887.
 2015-06-11 11:50:55 +01:00
Adam Harrison a424bfe715 Correctly interpret long form arguments that lack an equals symbol 2015-06-11 10:27:34 +01:00
Adam Harrison 4f6ace8b10 Permit optional trailing dot on hostname 2015-06-11 10:27:34 +01:00
Adam Harrison 108eea8b79 Modify weave run to use container name as fqdn 
When run is invoked with `--with-dns` and a container name but no
hostname, synthesise a fully qualified hostname from the container name
and the weaveDNS domain and supply that as a hostname for the container.
 2015-06-11 10:27:34 +01:00
Adam Harrison 9fddad02ad Add dns_domain helper to weave script 2015-06-11 10:26:07 +01:00
Matthias Radestock 9955de3e9b cosmetic: shorten usage info 2015-06-11 09:23:58 +01:00
Bryan Boreham a89b549c40 Change command-line syntax to net: prefix instead of --subnet 2015-06-10 17:28:06 +01:00
Bryan Boreham 1e71d2dacb Introduce new '<address_spec>' type in usage text 2015-06-10 17:24:36 +01:00
Bryan Boreham 3cdc3522be Don't overwrite CIDR_ARGS; write new variables ALL_CIDRS and IPAM_CIDRS 
Handle manual CIDRs and IPAM CIDRs separately, to avoid inconsistencies and misleading messages
 2015-06-10 17:24:35 +01:00
Bryan Boreham 2b4eec39cf Support '--subnet default' 2015-06-10 17:21:16 +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 f956a76455 Tighten error checking in weave script 
- --subnet is used but IPAM is off
 - arg that comes after --subnet is not a cidr
 2015-06-10 17:21:16 +01:00
Bryan Boreham d18ccac43b Free IPAM addresses individually in 'weave hide', because the user now has the ability to free some subnets and not others 2015-06-10 17:21:16 +01:00
Bryan Boreham 0613a06653 IPAM: handle multiple CIDRs in weave script 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
Bryan Boreham ae8985deb5 Merge pull request #884 from rade/881_get_container_id_on_start 
LGTM. Fixes #881
 2015-06-10 17:20:25 +01:00