VZ Cambria
2ba6d20007
Fix README.md host-local IPAM range start/end typo
2016-12-06 10:40:55 -05:00
Dan Williams
b0808a006a
Merge pull request #335 from JulienBalestra/json_ext
...
libcni conf: support .json file extension
2016-12-02 13:33:36 -06:00
Julien Balestra
a85593ce0d
libcni conf: support .json file extension
...
Content of the files are json, the configuration load should support .json
2016-11-23 10:48:32 +01:00
Dan Williams
de002ff25a
Merge pull request #322 from cf-container-networking/flannel-cni-stateDir
...
Allow flannel CNI plugin stateDir to be configurable
2016-11-18 15:27:35 -06:00
Mark St.Godard
6eac0ee904
flannel: rename stateDir to dataDir
...
Rename StateDir to DataDir for flannel CNI plugin
2016-11-17 15:54:29 -06:00
Gabe Rosenhouse
46e3a6b7be
Merge pull request #330 from bboreham/ns-warning
...
Expand description of goroutine+netns problems
2016-11-17 08:00:31 -08:00
Bryan Boreham
c20f895fa8
Expand description of goroutine+netns problems
2016-11-17 15:45:38 +00:00
Gabe Rosenhouse
ba6c5af5dc
Merge pull request #327 from dcbw/host-local-tests
...
host-local: add DataDir IPAM conf option and use it for testcases
2016-11-14 08:17:40 -08:00
Mark St.Godard
15de81eac6
flannel: updated flannel test to use pkg/testutils
...
reworked the flannel test to use testutils CmdAddWithResult and
CmdDelWithResult
2016-11-13 12:16:32 -06:00
Gabe Rosenhouse
8b827d74b3
Merge pull request #328 from markstgodard/noop-cni-args
...
noop plugin: support multiple CNI_ARGS
2016-11-10 22:24:58 -08:00
Mark St.Godard
48d3b46eb2
noop plugin: support multiple CNI_ARGS
...
Updated noop plugin to parse the CNI_ARGS pairs, to allow more than just
the DEBUG arg.
2016-11-10 16:04:42 -06:00
Dan Williams
7b2006eed8
Merge pull request #324 from lstoll/lstoll-ipvlan-l3s
...
ipvlan: Support L3-Symmetric mode
2016-11-10 12:53:59 -06:00
Dan Williams
e085226f82
host-local: add DataDir IPAM conf option and use it for testcases
...
Add an e2e host-local plugin testcase, which requires being able
to pass the datadir into the plugin so we can erase it later.
We're not always guaranteed to have access to the default data
dir location, plus it should probably be configurable anyway.
2016-11-10 12:12:16 -06:00
Mark St.Godard
e6113c6517
flannel: update flannel documentation
...
add optional 'stateDir' to flannel docs
2016-11-09 09:34:35 -06:00
Gabe Rosenhouse
79643855f7
Merge pull request #307 from squeed/backwards-compatability-tests
...
testing: test invocation of newer plugins with an older libcni
2016-11-07 14:25:09 -08:00
Mark St.Godard
f0daefa63d
flannel: add unit tests for config loading
...
backfill unit tests to add coverage for loadFlannelNetConf and
loadFlannelSubnetEnv
2016-11-05 23:27:14 -05:00
Lincoln Stoll
9201f3f1d9
ipvlan: Support ipvlan l3s mode.
...
This landed in kernel in 4fbae7d
2016-11-05 13:41:07 -07:00
Lincoln Stoll
2ad1d04561
vendor: github.com/vishvananda/netlink@a1f8555
...
Update to current master, to get IPVLAN L3s def.
2016-11-05 13:41:01 -07:00
Mark St.Godard
fa264e6e36
flannel: add integration test suite
...
add new test for flannel plugin that delegates to the noop plugin and
validates that 'storeDir' can be configurable
2016-11-05 10:47:07 -05:00
Mark St.Godard
b463642ac0
Allow flannel CNI plugin stateDir to be configurable
...
- Add optional 'stateDir' to flannel NetConf, if not present default to
/var/lib/cni/flannel
Signed-off-by: Jay Dunkelberger <ldunkelberger@pivotal.io>
2016-11-03 17:10:13 -05:00
Casey Callendrello
8c6f6e0a60
testing: test invocation of newer plugins with an older libcni
2016-10-25 16:33:35 +02:00
Gabe Rosenhouse
0e09ad29df
Merge pull request #312 from tomdee/slack
...
Add slack badge and link
2016-10-24 16:25:48 -07:00
Tom Denham
bb8bcf08a8
Add slack badge and link
2016-10-24 16:23:04 -07:00
Gabe Rosenhouse
194f8ce6ea
Merge pull request #311 from rkamudhan/patch-2
...
Update ipvlan.md
2016-10-23 16:23:55 -07:00
Kuralamudhan Ramakrishnan
6e77c7f4f7
Update ipvlan.md
...
invalid json format
2016-10-23 23:18:44 +01:00
Gabe Rosenhouse
bff05e7572
Merge pull request #308 from rosenhouse/fix-skel-tests-containerid
...
skel tests: correct name of CNI_CONTAINERID in tests of env vars
2016-10-17 15:02:27 -07:00
Gabe Rosenhouse
8be31e1c6f
skel tests: correct name of CNI_CONTAINERID in tests of env vars
2016-10-16 17:18:57 -07:00
Gabe Rosenhouse
3450f08611
Merge pull request #305 from yuewko/add_infoblox_link
...
Add link to Infoblox IPAM plugin
2016-10-16 17:08:51 -07:00
Yue Ko
c24fce2ae8
Add link to Infoblox IPAM plugin
...
Added link to Infoblox IPAM plugin in README.
2016-10-11 11:07:30 -07:00
Gabe Rosenhouse
d872391998
Merge pull request #304 from danp/patch-1
...
docs/ptp: fix markdown formatting
2016-10-09 22:39:31 -07:00
Dan Peterson
85ab5c0f21
docs/ptp: fix markdown formatting
2016-10-09 21:22:27 -03:00
Dan Williams
af88b7c6cf
Merge pull request #301 from rosenhouse/backwards-compatibility-tests
...
A test verifies that libcni is backwards compatible with legacy plugins
2016-10-06 10:10:02 -05:00
Gabe Rosenhouse
165ca6f719
travis: git clone at great depth
...
ensures that git commits referenced by backwards compatibility tests are
always available in CI.
2016-10-05 20:48:53 -07:00
Gabe Rosenhouse
0087f302ea
Merge pull request #302 from rosenhouse/readme-3rd-party-plugins
...
3rd party plugins belong in their own repos
2016-10-03 08:39:23 -07:00
Gabe Rosenhouse
b2ef4aa1a7
docs: on contributing plugins to this repo
2016-10-02 23:44:59 -07:00
Gabe Rosenhouse
51b51a0182
testing: adds basic test of backwards compatibility
2016-10-02 22:18:53 -07:00
Dan Williams
a29fc24f11
Merge pull request #296 from rosenhouse/plugins-require-versioned-config
...
Plugins validate cniVersion of NetConf
2016-09-22 17:11:34 -05:00
Dan Williams
b5e0a4ef2e
Merge pull request #298 from freehan/fix-host-local-30
...
host-local: fix allocation of last address in a /30
2016-09-22 09:13:32 -05:00
Minhan Xia
52e4358cbd
host-local: fix allocation of last address in a /30
2016-09-21 13:10:05 -07:00
Brandon Philips
e70e6034d2
Merge pull request #299 from tgraf/cilium-link
...
List cilium as 3rd party plugin
2016-09-19 14:31:54 -07:00
Gabe Rosenhouse
5b696f3307
skel: use named constant for Incompatible CNI Version error code
2016-09-19 13:25:33 -07:00
Gabe Rosenhouse
0135e2751e
versioning: ipam config is not versioned
2016-09-19 13:25:28 -07:00
Gabe Rosenhouse
fba37620e0
versioning: plugins require version match with config
...
infer version 0.1.0 when config is missing an explicit "cniVersion" field
2016-09-19 13:00:49 -07:00
Gabe Rosenhouse
64bbcd8cf7
versioning: add basic version decode for network config
2016-09-19 12:57:08 -07:00
Thomas Graf
75d983ec25
README: List cilium as 3rd party plugin
...
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-09-19 13:45:39 +02:00
Gabe Rosenhouse
fd150a4c97
skel: Plugins require a cniVersion in the NetConf
2016-09-18 21:30:57 -07:00
Gabe Rosenhouse
56032390fe
Merge pull request #287 from rosenhouse/multi-version
...
Plugins report a list of supported versions
2016-09-12 13:44:14 -07:00
Gabe Rosenhouse
3f4011b3ec
Merge pull request #295 from rosenhouse/update-readme-cloudfoundry-link
...
readme: update link to CloudFoundry usage of CNI
2016-09-08 00:47:04 -04:00
Gabe Rosenhouse
d32ccb1899
readme: update link to CloudFoundry usage of CNI
2016-09-06 23:48:48 -04:00
Gabe Rosenhouse
7958b9f0cc
versioning: revert spec version to 0.2.0
2016-09-06 15:37:42 -04:00