Commit Graph

1834 Commits

Author SHA1 Message Date
d4d3f914e7 Merge pull request #21 from eyakubovich/no-path-rewrite
No more path rewriting
2015-06-12 16:29:58 -07:00
6caffd48b3 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
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
02981925c9 Merge pull request #20 from eyakubovich/flannel
add flannel plugin
2015-06-11 15:39:53 -07:00
58f6bc9c8b 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
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
ab83df2ebf Merge pull request #19 from eyakubovich/err-handling
Propagate json error object to the caller
2015-06-11 10:37:37 -07:00
31c0dbf110 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
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
54dfc9ef5d Merge pull request #13 from eyakubovich/dhcp
DHCP plugin
2015-05-21 18:18:58 -07:00
a6a822268c 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
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
7a8ee49891 macvlan and ipvlan: rename tmp iface name prior to calling IPAM 2015-05-19 17:43:44 -07:00
0c3baa8ff0 fix bridge to call IPAM after link creation 2015-05-19 17:43:44 -07:00
01298363ad vendoring sys/unix, go-systemd, dhcp libraries 2015-05-19 17:43:44 -07:00
49a018fa85 Merge pull request #12 from eyakubovich/git-ignore
adding .gitignore
2015-05-11 12:18:08 -07:00
5e643a02a0 adding .gitignore 2015-05-11 11:12:24 -07:00
e59e2fd890 Merge pull request #9 from eyakubovich/errors
report errors via JSON
2015-05-08 15:08:03 -07:00
601f991ee5 Merge pull request #9 from eyakubovich/errors
report errors via JSON
2015-05-08 15:08:03 -07:00
c7a1442830 report errors via JSON
This reflects the latest SPEC draft.
2015-05-08 15:07:09 -07:00
a4896a9401 report errors via JSON
This reflects the latest SPEC draft.
2015-05-08 15:07:09 -07:00
dfd99811c8 Merge pull request #11 from eyakubovich/nspath
Do not use netns as ID or for entropy
2015-05-08 15:02:56 -07:00
93be8e63f1 Do not use netns as ID or for entropy
ContainerID is now required so use that
or generate random bytes.

Fixes #5
2015-05-08 15:02:23 -07:00
b2d9801b25 Do not use netns as ID or for entropy
ContainerID is now required so use that
or generate random bytes.

Fixes #5
2015-05-08 15:02:23 -07:00
22376748d5 Merge pull request #2 from jonboulle/master
*: first cut at SPEC and README
2015-05-05 14:41:38 -07:00
ed97604e74 Merge pull request #8 from steveeJ/ipvlan
plugins: add ipvlan main plugin
2015-05-05 13:35:11 -07:00
1a71eb0caf plugins: add ipvlan main plugin
Add the ipvlan main plugin which is heavily based on the macvlan plugin.
Availabile modes for this plugin are l2 and l3, wheres l2 has the higher
compatibility due to support for multicast and broadcasts. L2 has therefore been
chosen as the default mode.
See the official docs at
https://www.kernel.org/doc/Documentation/networking/ipvlan.txt
for more information.

Fixes #6.
2015-05-02 23:18:03 -07:00
50799d826b spec: incorporate feedback 2015-04-28 20:51:29 -07:00
622f8b6e16 SPEC: wording tweak 2015-04-28 20:51:29 -07:00
6321656e96 wording fixes 2015-04-28 20:51:29 -07:00
0f8ca5aa60 *: first cut at SPEC and README 2015-04-28 20:51:29 -07:00
88377fa346 Add plugin code
This adds basic plugins.
"main" types: veth, bridge, macvlan
"ipam" type: host-local

The code has been ported over from github.com/coreos/rkt project
and adapted to fit the CNI spec.
2015-04-27 14:14:29 -07:00
c24708ff62 Add plugin code
This adds basic plugins.
"main" types: veth, bridge, macvlan
"ipam" type: host-local

The code has been ported over from github.com/coreos/rkt project
and adapted to fit the CNI spec.
2015-04-27 14:14:29 -07:00
502be19aed Initial commit 2015-04-04 20:35:49 -07:00