Matthias Radestock
db1ac2a343
Merge branch '1.5'
2016-05-09 11:50:09 +01:00
Matthias Radestock
a3b6380296
Merge pull request #2264 from weaveworks/issues/2123-die-another-way
...
Kill process instead of container, on container restart.
Fixes #2123
2016-05-09 11:47:58 +01:00
Matthias Radestock
ac0f284c5f
Merge branch '1.5'
2016-05-07 14:43:04 +01:00
Adam Harrison
158fa9d8e5
Reclaim plugin addresses using container ID of '_'
2016-05-07 14:35:15 +01:00
Bryan Boreham
8d71467802
Kill process instead of container, on container restart.
...
When Docker restarts a container and something goes wrong attaching
the network, kill the process inside the container instead of killing
the container, so that Docker will restart it again
2016-05-06 18:02:11 +01:00
Bryan Boreham
01e3d1d81b
Refactor: extract kill_container function
2016-05-06 15:45:54 +01:00
Adam Harrison
260b416cd7
Include interface name in container-addrs output
2016-05-06 14:12:50 +01:00
Adam Harrison
ad5845b67f
Fix echo_ips
2016-05-06 14:12:19 +01:00
Matthias Radestock
cf7ea357de
Merge branch '1.5'
2016-05-06 11:21:57 +01:00
Bryan Boreham
11c368531a
Add --log-level to weave usage message, and document it and a couple of
...
other options on the proxy.
2016-05-05 12:44:40 +00:00
Bryan Boreham
981b78f680
Merge pull request #2203 from weaveworks/issues/2197-add-equals
...
Add equals sign to --dns arg, for consistency
2016-04-22 14:39:18 +01:00
Bryan Boreham
b4f35f1d38
Add equals sign to --dns arg, for consistency
2016-04-22 11:16:58 +01:00
Martynas Pumputis
427b6d2902
Use ContainerID when restarting a container
...
Otherwise, we are risking to leak DNS entries which happens when
ContainerName is passed to `weave reset` and subsequent internal call
to nameserver creates a new entry instead of replacing the old one.
The ContainerID of the new entry is set to ContainerName and in such case
stopping the container will not remove the new entry.
2016-04-21 16:12:02 +01:00
Bryan Boreham
061d2b123f
Add weavedb to the images pulled by 'weave setup'
2016-04-20 11:53:10 +01:00
Bryan Boreham
1c7df2958a
Merge branch '1.4'
2016-04-18 17:15:37 +01:00
Adam Harrison
6ad9dac71a
Merge pull request #2165 from weaveworks/issues/2164-less-deleting
...
Store 'checkAlive' flag in IPAM, so we don't delete non-container IDs
2016-04-18 11:49:50 +01:00
Bryan Boreham
5e4ab7f307
Plumb isContainer through Claim calls
2016-04-18 10:16:54 +01:00
Matthias Radestock
e393b4aaa6
name db container after weave container
...
...so that we can start multiple weaves on a machine w/o them sharing
a single db container and tripping over each other as a result.
Unbreaks multiweave.
Fixes #2177
2016-04-16 03:09:45 +01:00
Adam Harrison
cadc3869b3
Launch observes --no-restart
2016-04-15 15:04:29 +01:00
Bryan Boreham
02516361c7
Merge pull request #2155 from weaveworks/issues/2065-rationalise-ipam-concepts
...
Rationalise IPAM concepts
2016-04-14 17:33:27 +01:00
Adam Harrison
af8f590646
Deprecate --init-peer-count
2016-04-14 12:46:03 +01:00
Adam Harrison
c3ecbc9d48
Implement unified --ipalloc-init parameter
2016-04-14 12:46:03 +01:00
Adam Harrison
a09986baa2
Rename consense -> prime
2016-04-14 12:46:03 +01:00
Bryan Boreham
358342aa4f
Use a data volume container for BoltDB files.
...
We provide a very small image to use for this container.
Also we add an empty weavedata.db file to weave image so it doesn't crash when run without volume override
2016-04-13 16:07:55 +01:00
Bryan Boreham
045edcca2f
Add iptables rule excluding multicast from NAT on 'weave expose'
2016-04-13 12:05:24 +01:00
Matthias Radestock
d1ca38e106
Merge pull request #2148 from weaveworks/issues/2146-cni-sock
...
Bind-mount the docker socket for CNI plugin
Fixes #2146
2016-04-11 16:03:14 +01:00
Matthias Radestock
4037c763c2
Merge branch '1.4'
2016-04-11 15:40:32 +01:00
Bryan Boreham
4bd6de5995
Extract out CNI setup so we can call it from a test
2016-04-11 15:28:11 +01:00
Martynas Pumputis
a4062bd15c
Remove trailing dot from FQDN
...
As it is described in #2140 , the trailing dot might appear
when starting a container via "weave run".
2016-04-11 11:17:36 +01:00
Bryan Boreham
e88e67f02c
Bind-mount docker socket for CNI plugin scripts
2016-04-08 15:16:54 +01:00
Bryan Boreham
934ec2467d
Eliminate race from call_weave; call check_running only after curl fails
2016-04-05 17:54:18 +01:00
Bryan Boreham
ff4d0dae70
Keep going if an IPAM claim errors
2016-04-05 17:54:18 +01:00
Matthias Radestock
bac3d65ede
refactor: use a 'case' for greater clarity
2016-04-05 17:54:18 +01:00
Bryan Boreham
ecb180c0c5
Ignore 404 from IP address claim when IPAM is disabled
2016-04-05 17:54:18 +01:00
Bryan Boreham
f01d91459b
Make http_call send error messages to stderr and return error codes,
...
and fix up all uses of this function.
2016-04-05 17:54:18 +01:00
Matthias Radestock
718e93bd23
add coverage to plugin
2016-03-30 17:40:32 +01:00
Matthias Radestock
254be128b0
cosmetic: consistency
2016-03-30 16:25:26 +01:00
Adam Harrison
051320e73c
Merge branch '1.4'
2016-03-29 11:45:24 +01:00
Matthias Radestock
b2a484d5f0
refactor: inline
2016-03-28 14:17:54 +01:00
Matthias Radestock
8472272afe
refactor(ish): bail early if weaveDNS is disabled
2016-03-28 14:10:31 +01:00
Matthias Radestock
ea3456756d
make weave dns-args and weave run work with --no-dns
...
...rather than exploding
i.e. the former returns nothing and the latter leaves naming related
container settings untouched, just like happens in the proxy and
plugin.
Fixes #2099 .
2016-03-28 14:04:07 +01:00
Matthias Radestock
0672a0858f
Merge branch '1.4'
2016-03-28 12:52:31 +01:00
Matthias Radestock
a1381fe0cf
add --no-dns to usage
...
Closes #1687 .
2016-03-28 12:49:31 +01:00
Matthias Radestock
6e0aea233b
Merge branch '1.4'
2016-03-28 11:36:18 +01:00
Matthias Radestock
abd138026b
cosmetic: identation
2016-03-28 11:10:36 +01:00
Konstantin Suvorov
ad42f27e03
Support custom docker args for weave-plugin
...
WEAVEPLUGIN_DOCKER_ARGS environment variable is used to pass custom args when creating plugin container
2016-03-23 16:20:06 +03:00
Adam Harrison
74d0b3b51e
Merge pull request #2075 from weaveworks/2044-multi-rmpeer
...
make `weave rmpeer` accept a list of peers
2016-03-21 15:55:22 +00:00
Adam Harrison
0d10479e8a
Add --observer to weave script help
2016-03-21 11:01:55 +00:00
Matthias Radestock
357d0e918a
Merge pull request #2000 from weaveworks/issues/1998-specify-ipam-seed
...
Allow specification of initial IPAM ring via --ipam-seed
Fixes #1998 .
2016-03-21 10:52:40 +00:00
Adam Harrison
3123418022
Merge pull request #2030 from weaveworks/issues/1992-cni-plugin
...
Implement CNI plugin
2016-03-21 10:51:19 +00:00
Matthias Radestock