396 Commits

Author SHA1 Message Date
Eugene Yakubovich
11e121cdd5 Merge pull request #80 from eyakubovich/add-version
spec: add cniVersion to results and config
2015-12-09 13:59:47 -08:00
Eugene Yakubovich
420a145719 spec: add cniVersion to results and config
Version all artifacts using semantic versioning
so that plugins and container runtimes coded against
different versions of the spec can interoperate.

Fixes #44
2015-12-02 13:06:20 -08:00
Stefan Junker
f777ca50e5 Merge pull request #78 from steveeJ/improve-errormsg-missing-subnet
host-local: detect missing subnet and error out
2015-11-30 20:56:25 +01:00
Stefan Junker
753b10503c host-local: detect missing subnet and error out 2015-11-25 21:18:48 +01:00
Eugene Yakubovich
19c18abdb1 Merge pull request #82 from steveeJ/dhcp-linkfix
dhcp: detect if link is down and attempt to set up
2015-11-20 12:18:18 -08:00
Stefan Junker
6f23757868 dhcp: detect if link is down and attempt to set up
With this we still get the "network is down" error, but after the 2nd
retry the interface is up and the dhcp request works.
2015-11-19 11:11:32 +01:00
Eugene Yakubovich
c3388070c3 Merge pull request #76 from eyakubovich/dns
spec: add "dns" field to the result JSON
2015-11-10 16:59:31 -08:00
Eugene Yakubovich
8aeb066a58 spec: add "dns" field to the result JSON
This adds an ability for networks to communicate
about the DNS nameservers they know about to the
container runtime.

Fixes #67
2015-11-10 16:58:01 -08:00
Eugene Yakubovich
442852a861 Merge pull request #73 from eyakubovich/flannel-fix
flannel: doc fix and check for missing subnet.env fields
2015-10-07 18:03:54 -07:00
Eugene Yakubovich
20f1b8694f flannel: doc fix and check for missing subnet.env fields
- Document that flannel outputs FLANNEL_NETWORK b/c we use it
- Check and error out if expecited fields are missing in subnetEnv file

Fixes #72
2015-10-07 15:38:12 -07:00
Michael Bridgen
e727d10746 Merge pull request #71 from jonboulle/master
README/CONTRIBUTING: mention cni-dev@ list
2015-10-05 12:10:56 +01:00
Jonathan Boulle
d3ca177ee4 README/CONTRIBUTING: mention cni-dev@ list 2015-10-01 12:43:43 -07:00
Eugene Yakubovich
f885288a2d Merge pull request #69 from eyakubovich/err-msgs
Route del would fail due to wrong scope; better errors
2015-09-30 11:56:56 -07:00
Eugene Yakubovich
b2b2597506 Merge pull request #70 from eyakubovich/copyright
Change copyright from CoreOS to CNI authors
2015-09-30 11:03:46 -07:00
Eugene Yakubovich
0becca2e96 Change copyright from CoreOS to CNI authors
CNI is developed by more than just CoreOS, Inc
and the copyright is retained by all CNI
contributors (for their respective contributed code).
2015-09-29 11:51:33 -07:00
Eugene Yakubovich
5efd3ba883 Route del would fail due to wrong scope; better errors
In some cases the route deletion would fail due to wrong
scope. It should be NOWHERE when deleting (per iproute2).
This also adds more verbose error messages.
2015-09-29 11:27:49 -07:00
Stefan Junker
f0266a2717 Merge pull request #65 from steveeJ/fix-veth-setup
Fix veth setup

Fixes #61 #64
2015-09-24 21:53:54 +02:00
Stefan Junker
5b7aa09e52 link: switch to host netns to set up host veth end 2015-09-24 18:49:27 +02:00
Stefan Junker
f1c9c632e1 Revert "plugins/ptp: allow host veth to be UP"
This reverts commit 231d2d5a27f3ba54219c3f0b1c8ef2c5dab4faaf.
2015-09-24 18:32:18 +02:00
Stefan Junker
39ea97f99d Merge pull request #63 from steveeJ/no-host-local-ptp
Merge host-local and host-local-ptp
2015-09-24 13:10:47 +02:00
Stefan Junker
231d2d5a27 plugins/ptp: allow host veth to be UP 2015-09-24 10:57:36 +02:00
Stefan Junker
6737bc8207 update ptp docs to reflect changes in plugin 2015-09-24 09:43:55 +02:00
Eugene Yakubovich
60be55a7d1 remove host-local-ptp plugin 2015-09-23 11:04:38 +02:00
Eugene Yakubovich
7d8d6b2a7e Use single IP on the host for ptp veths
Instead of allocating a /31 for each container,
use the same IP on the host side for all veths.
This is very similar how real point-to-point
devices work (using donor IPs).
2015-09-23 11:04:38 +02:00
Eugene Yakubovich
94be1cfaab revendoring netlink 2015-09-23 11:04:38 +02:00
Michael Bridgen
2a58bd9379 Merge pull request #60 from eyakubovich/fix-plugin-del
bug fix: exec of DEL cmd caused JSON decode error
2015-09-22 16:39:59 +01:00
Eugene Yakubovich
9ea56937d4 bug fix: exec of DEL cmd caused JSON decode error
When plugin is executed with a DEL command, it does not
print result to stdout unless there is an error. Therefore
it stdout bytes should not be passed to json.Unmarshal.
2015-09-18 10:30:10 -07:00
Michael Bridgen
cc918a1aea Merge pull request #59 from squaremo/factor-out-libcni
Factor an API out into a module
2015-09-17 00:06:54 +01:00
Michael Bridgen
b88f173c43 Factor an API out into a module
This takes some of the machinery from CNI and from the rkt networking
code, and turns it into a library that can be linked into go apps.

Included is an example command-line application that uses the library,
called `cnitool`.

Other headline changes:

 * Plugin exec'ing is factored out

The motivation here is to factor out the protocol for invoking
plugins. To that end, a generalisation of the code from api.go and
pkg/plugin/ipam.go goes into pkg/invoke/exec.go.

 * Move argument-handling and conf-loading into public API

The fact that the arguments get turned into an environment for the
plugin is incidental to the API; so, provide a way of supplying them
as a struct or saying "just use the same arguments as I got" (the
latter is for IPAM plugins).
2015-09-16 10:14:39 +01:00
Stefan Junker
5da5738456 Merge pull request #58 from steveeJ/remove-ipmasq-ifneedbe
ipvlan/macvlan: remove ipMasq related code
2015-09-10 22:08:57 +02:00
Stefan Junker
d896b82816 ipvlan/macvlan: remove ipMasq related code
Luckily the docs haven't mentioned support for ipMasq for both plugins so far.
Even if anyone has attempted to enable the feature in their configuration files it didn't have the desired effect for the network.
2015-09-09 14:16:39 +02:00
Stefan Junker
75657b0aac Merge pull request #57 from eyakubovich/maintainers
Add MAINTAINERS file
2015-09-09 12:05:35 +02:00
Eugene Yakubovich
c4808e616d Add MAINTAINERS file 2015-09-08 15:58:00 -07:00
Jonathan Boulle
06967ea734 Merge pull request #53 from NeilW/master
IPAM plugin: improve error messages
2015-09-08 14:26:11 -07:00
Neil Wilson
2d0d4b35e1 plugin/ipam: correct formatting of error message 2015-09-08 18:08:15 +00:00
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