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
Adam Harrison
e9081c6607
Allow specification of initial IPAM ring via --ipam-seed
2016-03-21 09:49:54 +00:00
Matthias Radestock
439e57ca56
make weave rmpeer accept a list of peers
...
This isn't as efficient as it could be. In particular we end up
broadcasting the ipam state for every peer listed. To avoid that we'd
have to change the HTTP API, and would no longer be able to use
'DELETE'. That is just not worth it.
Closes #2044 .
2016-03-20 15:53:45 +00:00
Bryan Boreham
88cb07203a
Improve name of cni_volume_options and include them when running the CNI plugin inside a container
2016-03-18 19:02:28 +00:00
Matthias Radestock
0474227d6e
Merge pull request #2062 from weaveworks/issues/2059-weave-ps-ignore-stopped
...
Protect container-addrs util_op against stopped containers
Fixes #2059 .
2016-03-18 11:13:14 +00:00
Adam Harrison
04bbb14f59
Propagate container-addrs util_op failure
2016-03-18 10:56:10 +00:00
Matthias Radestock
221ef4adca
make a few more shell funs safe
...
...for calling in a context w/o 'set -e', even though right now they
always are.
Follow-on of #2054 .
2016-03-17 21:32:08 +00:00
Matthias Radestock
c1d4e34ed0
Merge pull request #2055 from weaveworks/cleanup_attach_router
...
Remove unnecessary netns change in attach_router
2016-03-17 20:50:03 +00:00
Bryan Boreham
4903c2b23c
Remove unnecessary netns switch for router in attach_router,
...
and improve the name of the function which sends existing
container data into the router
2016-03-17 20:32:41 +00:00
Bryan Boreham
0705319f25
Return failure from various functions when sub-operation fails.
...
We cannot rely on `set -e` to fail the whole script in contexts
where functions are called inside conditionals.
2016-03-17 15:02:40 +00:00
Bryan Boreham
024eb46c7d
CNI plugin implemented as script that docker runs plugin container,
...
installed via `weave setup`
2016-03-17 14:29:33 +00:00
Matthias Radestock
aa1c1cc9be
ignore arping failures
...
This is a largely cosmetic change since arping really shouldn't fail.
2016-03-16 20:32:42 +00:00
Matthias Radestock
2a10182cf6
Merge pull request #2029 from weaveworks/router-and-proxy-always-restart
...
Router and proxy run with --restart=always
2016-03-14 17:19:47 +00:00
Adam Harrison
115162fbfd
Merge pull request #2037 from weaveworks/2021-fallback-to-hypervisor-uuid
...
fall back to hypervisor uuid for mac derivation
2016-03-14 16:56:00 +00:00
Adam Harrison
82adc85562
Router and proxy run with --restart=always
2016-03-14 16:31:06 +00:00
Matthias Radestock
459bb08828
fall back to hypervisor uuid for mac derivation
...
since the system uuid is not available on paravirtual EC2 VMs, and
possibly other hypervisors.
Fixes #2021
2016-03-09 22:35:44 +00:00
Bryan Boreham
3ad9d8e785
Don't fail start if image is missing
2016-03-09 17:10:20 +00:00
Matthias Radestock
f8e2af32cd
refactor: extract common docker run options
2016-03-08 23:10:19 +00:00
Adam Harrison
6584df274e
Implement weave consense
2016-03-03 18:52:09 +00:00
Bryan Boreham
b76e2a87cf
Store address+subnet prefix for 'owned' addresses
2016-03-02 17:21:24 -08:00
Bryan Boreham
b6eec08247
Return all applicable results from Lookup
...
and stop erroring on Lookup not found; just return a blank result
2016-03-02 17:01:12 -08:00
Adam Harrison
cb9af20a2e
Replace PROCFS with --pid=host
2016-03-01 20:10:47 +00:00
Bryan Boreham
f17d50cc50
Check the exact version of the image, not the base
2016-02-26 23:44:04 +00:00
Bryan Boreham
436f8ef7c8
Compare the environment so we can detect a change in password
2016-02-26 23:41:57 +00:00
Bryan Boreham
561c8d012c
Treat a restarting container like a running one, for idempotency
2016-02-26 23:41:46 +00:00
Bryan Boreham
bb4c0f5247
Start existing container, if its image and arguments match
2016-02-26 23:40:02 +00:00