Bryan Boreham
85023e0a76
Extract AttachContainer() function
...
Also move netlink and netns code from common to net
Creates interface if not already there
Adds addresses
Move the set link 'up' to after addresses are added
2016-05-25 17:29:45 +01:00
Matthias Radestock
ac0f284c5f
Merge branch '1.5'
2016-05-07 14:43:04 +01:00
Adam Harrison
260b416cd7
Include interface name in container-addrs output
2016-05-06 14:12:50 +01:00
Martynas Pumputis
9dd1fbba39
Add LoggingHTTPHandler for logging REST requests at the server-side
2016-05-03 15:40:37 +01:00
Matthias Radestock
50af75972a
Merge pull request #2122 from weaveworks/issues/2081-gossip-to-restarted-peer
...
Update weaveworks/mesh to send gossip to restarted peer
Fixes #2085 .
2016-04-06 12:01:38 +01:00
Matthias Radestock
45b36b378d
Merge branch '1.4'
2016-04-05 16:57:47 +01:00
Bryan Boreham
ebc5dcb4bb
Delay notifying observers about 'start' events
...
...until the container has a pid, or we see the same container die.
This is to work around https://github.com/docker/docker/issues/18574
Fixes #2090 . Partially addresses #1775 .
2016-04-05 16:20:07 +01:00
Bryan Boreham
c38dcb1d73
Adapt to logging changes in weaveworks/mesh
2016-04-04 16:01:58 +01: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
5e0231ec5e
refactor(ish): unify logging in docker client wrapper
...
and get rid of some debug logging.
and eliminate a dot import in the process.
2016-03-20 10:40:26 +00:00
Bryan Boreham
b00f0aee65
Check errors on test for root namespace
2016-03-18 19:39:52 +00:00
Matthias Radestock
7b6364696c
Merge branch '1.4'
2016-03-18 19:29:59 +00:00
Matthias Radestock
5dfd104728
reduce docker event subscription retry max interval
2016-03-18 19:29:21 +00:00
Adam Harrison
f9f6e8ed26
Protect container-addrs against stopped containers
2016-03-18 10:46:30 +00:00
Bryan Boreham
a66543f98e
Use link ParentIndex where available
2016-03-17 18:20:18 +00:00
Bryan Boreham
b153e6a0d2
Simplify, after review feedback
2016-03-17 14:29:34 +00:00
Adam Harrison
b09b556796
Utility function to configure ARP cache timers
2016-03-17 14:29:25 +00:00
Bryan Boreham
2d6a916b2d
Find weave veths by looking at what is connected to the bridge, not by name
...
and don't even look at containers running in the root namespace
2016-03-17 12:41:37 +00:00
Bryan Boreham
011fb55e5f
Refactor FindNetDevs so we can get the link, and re-use parts of the function
2016-03-17 12:41:37 +00:00
Bryan Boreham
4eaeb0f30c
Merge branch '1.4'
2016-03-16 14:52:59 +00:00
Adam Harrison
922f465ecb
Reset retry interval if we spent long enough processing events
2016-03-16 13:41:18 +00:00
Adam Harrison
08e9db900a
Retry docker event subscription
2016-03-16 09:23:32 +00:00
Bryan Boreham
35671135bd
Return errors that happen inside WithNetNS
2016-03-10 15:18:16 +00:00
Bryan Boreham
95cbc8940e
Sync 'owned' data with existing containers at startup
2016-03-02 11:35:24 -08:00
Bryan Boreham
dd74bb1774
Simplify by using GetFromPid
2016-03-01 12:12:46 -08:00
Adam Harrison
adf56d316d
Remove obsolete alternative procfs support
2016-03-01 20:10:47 +00:00
Matthias Radestock
3283bc89fc
Merge branch '1.4'
2016-02-23 13:56:56 +00:00
Matthias Radestock
e52abafc48
treat restarting containers as "not running"
...
thus preventing stale DNS & IPAM entries.
Fixes #1977
2016-02-20 10:59:47 +00:00
Adam Harrison
65c48707f6
Use netlink instead of shelling out to weave ps
2016-02-04 12:51:18 +00:00
Bryan Boreham
b2b293a8ee
Added 'ContainerDestroyed()' callback from docker client
2016-01-12 14:38:44 +00:00
Matthias Radestock
79452d3a9a
cosmetic(ish)
2016-01-02 14:00:23 +00:00
Matthias Radestock
75d9e95b15
appease linter
2016-01-02 12:35:10 +00:00
Bryan Boreham
357f67255e
Move logging of Docker API info to callers
2015-12-17 08:25:51 +00:00
Paul Bellamy
a4ef96690e
support alternate DOCKER_HOST settings when launching the plugin
2015-12-15 18:12:31 +00:00
Paul Bellamy
f28ad350bd
make weave and the proxy work with tcp-only dockers via DOCKER_HOST
2015-12-15 18:02:59 +00:00
Bryan Boreham
ec420c66d4
Review feedback
2015-12-01 16:47:47 +00:00
Bryan Boreham
5eb99fe5ef
Get container IP for various networks
2015-11-30 14:27:33 +00:00
Bryan Boreham
bd2b8df7c5
Refactor to use Weave's docker client and watcher
2015-11-30 13:25:20 +00:00
Bryan Boreham
682133a56a
Move ODP helper functions out to their own package
2015-11-10 17:09:17 +00:00
Matthias Radestock
8bd77c0d47
refactor: get rid of router/utils.go
...
most functions end up in other files in the router package, but a few
land in common.
2015-11-07 15:45:29 +00:00
Bryan Boreham
9ad1ccf19f
Don't listen to SIGUSR1, since we stopped handling it a few months back
2015-10-02 13:52:23 +01:00
Bryan Boreham
81e8ba223f
Do network attach on docker event rather than intercepting start and restart commands.
...
This means it also works when the docker daemon restarts a container.
2015-09-01 17:48:12 +01:00
Matthias Radestock
c1c5450caf
more idiomatic logger initialisation, with standard default log level
2015-08-18 12:04:48 +01:00
Tom Wilkie
cdab6a71b7
Merge pull request #1289 from weaveworks/move-listvar
...
Move ListVar into common, so it can be reused elsewhere.
2015-08-12 12:56:25 +01:00
Tom Wilkie
45293fdcac
Move ListVar into common, so it can be reused elsewhere.
2015-08-12 11:35:57 +00:00
Adam Harrison
fc9a1c8664
new weave status, weave status ..., and weave report
2015-08-11 12:15:13 +01:00
David Wragg
7d6f85424c
Move OnOff into router.go
2015-08-03 14:06:23 +01:00
Tom Wilkie
25c9180fdf
Don't swallow errors in the docker client.
2015-07-17 12:35:12 +00:00
Matthias Radestock
7063ca51aa
remove dead code
2015-07-15 05:35:05 +01:00
Matthias Radestock
97498d26f7
remove dead code
2015-07-15 05:32:35 +01:00
Bryan Boreham