Bryan Boreham
a1c3cba363
Invert multicast option in plugin
...
Now it's off by default, and there is an option to enable the
multicast route per-network.
We turn it on for the `weave` network created when we start the plugin.
2016-06-02 12:52:30 +01:00
Adam Harrison
c9525532ea
Merge branch '1.5'
...
Closes #2300
2016-05-26 16:08:14 +01:00
Bryan Boreham
fd257f43d1
Don't release fake gateway address
...
Watch out for Docker releasing the fake gateway address we create when
the network is set up, and don't pass it on to Weave IPAM.
2016-05-26 12:30:03 +00:00
Bryan Boreham
6dd109a5bb
Only do ethtool tx off in bridged (pcap) mode.
...
Detect the bridge type in the same way the weave script does.
2016-05-25 17:34:13 +01:00
Bryan Boreham
2702b85ee5
Improve veth name construction; use a constant instead of "ethwe"
2016-05-25 17:34:13 +01:00
Bryan Boreham
8717fd15ed
Use 'peer' and 'veth' instead of 'guest' and 'local', after review comments
2016-05-25 17:34:13 +01:00
Bryan Boreham
ac14b19db8
Move attach() and detach() from shell script to Go
2016-05-25 17:34:13 +01:00
Bryan Boreham
4fc2835d92
Extract AddRoute function
2016-05-25 17:29:45 +01:00
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
Bryan Boreham
0257274aa8
Extract basic veth setup
2016-05-25 17:23:49 +01:00
Bryan Boreham
9aaa7f19fd
initialize via sub-function
2016-05-25 17:17:19 +01:00
Bryan Boreham
9f8b94645d
Obtain IP address before setting up veth
2016-05-25 17:17:19 +01:00
Bryan Boreham
c458deaf80
Slight cleanup
2016-05-25 17:17:19 +01:00
Bryan Boreham
f11d91badf
Extract veth creation and LinkSetUp to net package
2016-05-25 17:17:19 +01:00
Bryan Boreham
ede00047db
Send out arp update from CNI plugin
2016-05-25 12:05:20 +01:00
Adam Harrison
df2868fcdd
Plugin README links refer to latest release docs
2016-05-05 16:32:53 +01:00
Matthias Radestock
a5739e8753
make plugin README link to other docs on github rather than website
...
until we have stable (non-version-specific) links for the latter.
Stop-gap for #2214 .
2016-04-26 14:06:40 +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
Bryan Boreham
c6e8f54fe7
Add CNI plugin to description
2016-04-11 11:31:25 +01:00
Bryan Boreham
13f3ff15bd
Sanity-check ipam args to make diagnosis easier
2016-04-08 15:18:08 +01:00
Matthias Radestock
4482d307bf
tweak ipam plugin logging
...
- log requests at info level instead of debug level
- log errors at error level instead of debug level
2016-03-24 18:52:55 +00:00
Matthias Radestock
5aa2a7a14c
refactor(ish) of ipam plugin logging
...
prefix all log entries with "[ipam]"
Also eliminate a dot import.
2016-03-24 18:52:55 +00:00
Matthias Radestock
984cad5b58
clean up network plugin logging
...
Consistency, consistency, consistency:
- prefix all log messages with "[net]" - important since the same
process acts as both a network and ipam driver
- include the API function name in all log messages
- log request and response details at debug level
- log request summary at info level
- log ContainerStarted as a pseudo API function, but only at debug
level (since it can be quite high volume)
And eliminate some dot imports.
2016-03-24 18:52:44 +00:00
Matthias Radestock
de8c1d262f
don't error log in 'createAndAttach'
...
It is a library function, so logging of any errors should be left to
the caller.
We also get rid of a logged warning which contained the complete data
structure returned by netlink.LinkByName.
So this function now does no logging at all. Which is how it should be.
2016-03-24 18:52:07 +00:00
Matthias Radestock
2d964bdc95
don't log in cni; just return errors
...
CNI is invoked from the command line; so there is no point in getting
clever about logging.
2016-03-24 18:51:34 +00:00
Matthias Radestock
91044ac0fa
cosmetic: consistency
2016-03-24 18:51:08 +00:00
Matthias Radestock
98aeb674c4
cosmetic: more plugin error message/logging tweaks
2016-03-24 18:41:47 +00:00
Matthias Radestock
ea11c5eedc
cosmetic: some error logging message tweaks
2016-03-24 18:16:57 +00:00
Matthias Radestock
c146ee142d
Merge branch '1.4'
2016-03-24 17:26:00 +00:00
Matthias Radestock
fce954192c
fail plugin operation on bridge attachment error
...
Fixes #2097 .
2016-03-24 17:01:15 +00:00
Bryan Boreham
ecdd7aa7ce
Configure arp cache on new interface
2016-03-17 14:29:33 +00:00
Bryan Boreham
ac4e87418a
Set a default route via bridge if config doesn't specify any
2016-03-17 12:41:14 +00:00
Bryan Boreham
42ff61f97c
CNI net plugin
2016-03-17 12:41:14 +00:00
Bryan Boreham
08059412b5
Refactor so we can call parts individually
2016-03-17 12:41:14 +00:00
Bryan Boreham
f9615c34dc
CNI IPAM plugin
2016-03-17 12:41:14 +00:00
Bryan Boreham
703b8dfd11
Expose 'ipam' type so we can refer to it elsewhere
2016-03-17 12:08:37 +00:00
Bryan Boreham
eee77d49d1
Claim IP takes CIDR not IP
2016-03-16 14:22:39 +00:00
Bryan Boreham
0009b05635
Improve naming of 'release' function in IPAM API
2016-03-07 16:24:53 +00:00
Matthias Radestock
0f9d9c77a3
remove cruft
2016-02-19 00:30:22 +00:00
Matthias Radestock
497a104db7
Merge branch '1.4'
2016-02-18 21:59:42 +00:00
Bryan Boreham
b442567406
Add two functions required by ipamapi "contract" but not actually used
2016-02-18 15:29:10 +00:00
Matthias Radestock
ae725e333a
make plugin pay attention to WEAVE_HTTP_ADDR
2016-02-03 11:54:05 +00:00
Adam Harrison
90795e5446
Merge branch '1.4'
...
Conflicts:
plugin/ipam/driver.go
2016-02-02 16:04:49 +00:00
Adam Harrison
5fbceb0f78
Merge pull request #1777 from weaveworks/remove-plugin-nameserver-option
...
Remove 'nameserver' option from plugin
2016-01-29 15:24:04 +00:00
Bryan Boreham
e4828ad30a
Remove 'nameserver' option
2016-01-29 14:03:04 +00:00
Bryan Boreham
482045aed8
Send back an http error code with any plugin errors.
2016-01-27 14:53:26 +00:00
Bryan Boreham
610a90c727
Claim address requested by caller
2016-01-27 12:11:01 +00:00
Bryan Boreham
2970df4505
Revert "Refactor plugin to create veths in CreateEndpoint"
2016-01-25 17:57:53 +00:00
Adam Harrison
87f793f0e0
Merge pull request #1808 from weaveworks/1803-plugin-mac
...
Refactor plugin to create veths in CreateEndpoint
2016-01-25 11:53:17 +00:00
Bryan Boreham
1a59734cdb
Support subnet and iprange arguments on network create
2016-01-22 13:37:36 +00:00