Neil Wilson
8462a3f607
IPAM plugin: improve error messages
...
Make it more clear that we failed to find an IPAM plugin.
Check for a missing plugin name and issue a more helpful error.
2015-09-08 18:08:15 +00:00
Jonathan Boulle
fb9b8ad1bc
Merge pull request #55 from jonboulle/travis
...
*: add basic test script + travis hook
2015-09-07 16:28:35 -07:00
Jonathan Boulle
d10d1a148e
*: add basic test script + travis hook
...
Adds a simple test script, mostly to perform gofmt and govet checking;
currently tests only exist for the DHCP plugin.
2015-09-07 16:21:53 -07:00
Stefan Junker
69d50f545d
Merge pull request #54 from jonboulle/master
...
plugin/ipam: fix typo in error message
2015-09-08 00:49:28 +02:00
Jonathan Boulle
7478744cf5
plugin/ipam: fix typo in error message
2015-09-07 15:43:34 -07:00
Stefan Junker
ef820646c5
Merge pull request #51 from steveeJ/plugins-args
...
CNI_ARGS: use ';' to split args as documented
2015-09-05 19:00:53 +02:00
Stefan Junker
8b634b90da
CNI_ARGS: use ';' to split args as documented
2015-09-05 18:58:58 +02:00
Stefan Junker
fbd828cf60
Merge pull request #42 from steveeJ/plugins-args
...
host-local: allow ip request via CNI_ARGS
2015-09-04 01:42:11 +02:00
Stefan Junker
1d398af124
host-local: allow ip request via CNI_ARGS
...
A specific IP can now be requested via the environment variable CNI_ARGS, e.g.
`CNI_ARGS=ip=1.2.3.4`.
The plugin will try to reserve the specified IP.
If this is not successful the execution will fail.
2015-09-04 01:38:22 +02:00
Eugene Yakubovich
59f58fb974
Merge pull request #49 from eyakubovich/dco
...
Add DCO and CONTRIBUTING.md
2015-09-02 11:01:42 -07:00
Eugene Yakubovich
d1ccecf88f
Add DCO and CONTRIBUTING.md
2015-09-02 11:00:27 -07:00
Jonathan Boulle
4f6ab3c2ad
Merge pull request #43 from alexwlchan/master
...
Fix a few spelling mistakes in the docs
2015-08-20 09:17:56 -07:00
Alex Chan
ac0b5177a4
Fix a few spelling mistakes in the docs
2015-08-20 16:41:25 +01:00
Eugene Yakubovich
34be862dc3
Merge pull request #41 from eyakubovich/flannel-route
...
flannel: set up route for the entire flannel network
2015-08-15 16:28:09 -07:00
Eugene Yakubovich
e38572b967
flannel: set up route for the entire flannel network
...
Without it, packets leave via default route iface
and come back via interface added by flannel plugin.
If rp_filter=1, the packets are dropped.
2015-08-10 14:13:06 -07:00
Jonathan Boulle
4be9a4f771
Merge pull request #37 from steveeJ/fix-docs
...
host-local: fix routes in README examples
2015-08-03 15:12:07 -07:00
Stefan Junker
d961f6cd39
host-local: fix routes in README examples
2015-08-03 15:37:14 +02:00
Eugene Yakubovich
8c8753e409
Merge pull request #34 from eyakubovich/document-plugins
...
Document the plugins
v0.1.0
2015-07-22 09:02:39 -07:00
Eugene Yakubovich
f8000548d3
Merge pull request #33 from eyakubovich/veth-to-ptp-rename
...
Rename veth plugin to ptp and add docs.
2015-07-21 17:20:37 -07:00
Eugene Yakubovich
64f5cf9e82
Rename veth plugin to ptp and add docs.
...
ptp (point-to-point) better describes the nature of the plugin
as veth pairs are also used by the bridge plugin.
2015-07-21 17:20:11 -07:00
Eugene Yakubovich
9751c80740
Document the plugins
...
Adds a .md file to the Documentation/ folder for each plugin.
Fixes #16
2015-07-21 17:19:18 -07:00
Eugene Yakubovich
d053cd7184
Merge pull request #35 from eyakubovich/ip_forward
...
enable net.ipv4.ip_forward in plugins that need it
2015-07-21 17:12:04 -07:00
Eugene Yakubovich
b5e7847649
Merge pull request #29 from eyakubovich/spec-fmt-fixes
...
spec: fix fmt issues and example JSON
2015-07-16 20:18:33 -07:00
Eugene Yakubovich
77fc4ad0d6
Merge pull request #32 from eyakubovich/ipvlan-fix
...
ipvlan: wrong name was used during link creation
2015-07-15 10:25:07 -07:00
Eugene Yakubovich
91454b6ebb
enable net.ipv4.ip_forward in plugins that need it
2015-07-13 15:41:02 -07:00
Eugene Yakubovich
cc393ddba7
ipvlan: wrong name was used during link creation
...
Instead of temp (random) name, the final name (e.g. eth0)
was used during link creation. This would collide on hosts
that already had the an interface with such a name.
2015-07-10 14:02:35 -07:00
Jonathan Boulle
420d52ce4b
Merge pull request #30 from zenlinTechnofreak/master
...
Fix environment bug,version of golang should be 1.4+, add reminding i…
2015-07-08 12:18:54 -07:00
zenlin
1ca1c875c2
Fix environment bug,version of golang should be 1.4+, add reminding in Readme.md
2015-07-08 18:21:58 +08:00
Eugene Yakubovich
edf08b56d2
spec: fix fmt issues and example JSON
2015-07-06 18:05:10 -07:00
Eugene Yakubovich
f56f1d90fd
Merge pull request #22 from eyakubovich/netns-err
...
dhcp: don't swallow err from netns switch
2015-06-15 16:08:01 -07:00
Eugene Yakubovich
8b6b04773e
dhcp: don't swallow err from netns switch
2015-06-15 14:32:16 -07:00
Eugene Yakubovich
50c14e6223
Merge pull request #24 from eyakubovich/dhcp-abs-path
...
dhcp: make netns path absolute prior to RPC
2015-06-15 12:46:40 -07:00
Eugene Yakubovich
fc42b801fa
Merge pull request #25 from eyakubovich/dhcp-timeout
...
dhcp: decrease read timeout and clamp backoff
2015-06-15 12:45:09 -07:00
Eugene Yakubovich
30316e3fa9
dhcp: make netns path absolute prior to RPC
...
The dhcp daemon may be running with a different cwd
and so the netns paths need to be absolute. This patch
also refactors the code to pull out the common, RPC
parts, out into a separate function.
2015-06-15 12:44:43 -07:00
Eugene Yakubovich
295e02e4e9
dhcp: decrease read timeout and clamp backoff
2015-06-15 12:40:34 -07:00
Eugene Yakubovich
d4d3f914e7
Merge pull request #21 from eyakubovich/no-path-rewrite
...
No more path rewriting
2015-06-12 16:29:58 -07:00
Eugene Yakubovich
16680be42d
No more path rewriting
...
Path rewriting causes too many problems when vendoring
vendored code. When CNI code is vendored into rkt,
godep has problems code already vendored by CNI.
2015-06-12 16:29:18 -07:00
Eugene Yakubovich
02981925c9
Merge pull request #20 from eyakubovich/flannel
...
add flannel plugin
2015-06-11 15:39:53 -07:00
Eugene Yakubovich
78daffc479
add flannel plugin
...
This introduces a notion of a "meta" plugin. A meta plugin
is one that delegates the actual work of setting up the interface
to the main plugin. The meta plugin is used to select and dynamically
configure the main plugin. The sequence of events, is as follows:
Given netconf like:
{
"name": "mynet",
"type": "flannel",
"delegate": {
"type": "bridge"
}
}
flannel fills in values like "mtu", "ipam.subnet" and delegates to
"bridge" main plugin. "bridge" plugin will operate as usual, calling
into ipam module for IP assignment.
Delegate dictionary should not contain "name" field as it will be
filled in by the flannel plugin.
2015-06-11 15:37:58 -07:00
Jonathan Boulle
ab83df2ebf
Merge pull request #19 from eyakubovich/err-handling
...
Propagate json error object to the caller
2015-06-11 10:37:37 -07:00
Eugene Yakubovich
33a575f49d
Propagate json error object to the caller
...
When plugin errors out, it prints out a JSON object to stdout
describing the failure. This object needs to be propagated out
through the plugins and to the container runtime. This change
also adds Print method to both the result and error structs
for easy serialization to stdout.
2015-06-09 10:46:28 -07:00
Eugene Yakubovich
54dfc9ef5d
Merge pull request #13 from eyakubovich/dhcp
...
DHCP plugin
2015-05-21 18:18:58 -07:00
Eugene Yakubovich
c70320b5ed
add DHCP IPAM plugin
...
The plugin binary actually functions in two modes. The first mode
is a regular CNI plugin. The second mode (when stared with "daemon" arg)
runs a DHCP client daemon. When executed as a CNI plugin, it issues
an RPC request to the daemon for actual processing. The daemon is
required since a DHCP lease needs to be maintained by periodically
renewing it. One instance of the daemon can server arbitrary number
of containers/leases.
2015-05-21 13:36:51 -07:00
Eugene Yakubovich
7a8ee49891
macvlan and ipvlan: rename tmp iface name prior to calling IPAM
2015-05-19 17:43:44 -07:00
Eugene Yakubovich
0c3baa8ff0
fix bridge to call IPAM after link creation
2015-05-19 17:43:44 -07:00
Eugene Yakubovich
01298363ad
vendoring sys/unix, go-systemd, dhcp libraries
2015-05-19 17:43:44 -07:00
Eugene Yakubovich
49a018fa85
Merge pull request #12 from eyakubovich/git-ignore
...
adding .gitignore
2015-05-11 12:18:08 -07:00
Eugene Yakubovich
5e643a02a0
adding .gitignore
2015-05-11 11:12:24 -07:00
Eugene Yakubovich
601f991ee5
Merge pull request #9 from eyakubovich/errors
...
report errors via JSON
2015-05-08 15:08:03 -07:00
Eugene Yakubovich
a4896a9401
report errors via JSON
...
This reflects the latest SPEC draft.
2015-05-08 15:07:09 -07:00