b0b896f79a
plugins/flannel: organize test JSON alphabetically
...
Otherwise the test fails, since Go's JSON marshaller prints
dict items alphabetically in its String() call.
2017-01-25 11:31:18 -06:00
ad2a5ccb61
macvlan/ipvlan: use common RenameLink method
2017-01-25 11:31:18 -06:00
befb95977c
types: make Result an interface and move existing Result to separate package
2017-01-25 11:31:18 -06:00
cb4cd0e12c
testutils: pass netConf in for version operations; pass raw result out for tests
2017-01-25 11:31:18 -06:00
dcadf4f9b5
Merge pull request #355 from rosenhouse/skel-main-errors
...
skel: adds PluginMainWithError which returns a *types.Error
2017-01-23 07:42:57 -08:00
af5c2f303a
skel: adds PluginMainWithError which returns a *types.Error
...
Enables plugins to do their own error-handling and cleanup logic
2017-01-22 16:57:42 -08:00
1acc927ab0
Merge pull request #352 from containernetworking/conventions
...
Documentation: Add conventions doc
2017-01-20 13:50:24 -08:00
04f357344d
Update CONVENTIONS.md
2017-01-20 12:49:00 -08:00
e476ab7189
Merge pull request #346 from dcbw/ordered-chaining
...
api/plugins: implement ordered plugin chaining
2017-01-20 08:35:37 -08:00
0c2a034f01
api,libcni: add network config list-based plugin chaining
...
Using a new ".configlist" file format that allows specifying
a list of CNI network configurations to run, add new libcni
helper functions to call each plugin in the list, injecting
the overall name, CNI version, and previous plugin's Result
structure into the configuration of the next plugin.
2017-01-19 22:28:21 -06:00
7e16c86a52
spec: add network configuration list specification
2017-01-19 22:28:20 -06:00
947b79e334
Spec/Conventions: Update to include plugin config
2017-01-19 18:05:28 -08:00
0a1b48f520
noop: allow specifying debug file in config JSON
...
Chaining sends different config JSON to each plugin, but the same
environment, and if we want to test multiple noop plugin runs in
the same chain we need a way of telling each run to use a different
debug file.
2017-01-19 09:56:42 -06:00
d716d73444
Documentation: Add conventions doc
2017-01-17 15:53:24 -08:00
530dd71e19
Merge pull request #334 from squeed/host-local-dns
...
ipam/host-local: add ResolvConf argument for DNS configuration
2017-01-12 17:06:04 -08:00
fa58dd8889
Merge pull request #350 from rosenhouse/spec-version
...
spec: notice of version
2017-01-12 13:42:25 -08:00
20fde00ea6
spec: notice of version
2017-01-11 18:49:10 -08:00
5cde14cd7b
ipam/host-local: add ResolvConf argument for DNS configuration
...
This adds the option `resolvConf` to the host-local IPAM configuration.
If specified, the plugin will try to parse the file as a resolv.conf(5)
type file and return it in the DNS response.
2017-01-11 18:48:35 +01:00
4406607649
Merge pull request #115 from aanm/implementing-ipam-as-lib
...
ipam/host-local: Move allocator and config to backend
2017-01-10 13:06:46 -08:00
f60111b093
ipam/host-local: Move allocator and config to backend
...
Signed-off-by: André Martins <aanm90@gmail.com >
2016-12-21 04:43:21 +00:00
98ff61aac3
Merge pull request #325 from squeed/update-maintainer
...
MAINTAINERS: hi CaseyC!
2016-12-19 11:02:20 -08:00
6dc01a772b
MAINTAINERS: hi CaseyC!
2016-12-19 12:38:29 -05:00
e3bcc3e41b
Merge pull request #345 from rosenhouse/travis-go-versions
...
travis: roll forward the versions of Go that we test
2016-12-16 08:06:17 -08:00
bc1d61e3db
travis: roll forward the versions of Go that we test
2016-12-15 18:41:07 -08:00
652bae1deb
Merge pull request #314 from rosenhouse/noop-helpful-message
...
plugins/noop: return a helpful message for test authors
2016-12-15 18:35:43 -08:00
47f6604b5a
Merge pull request #344 from dcbw/interface-checks
...
all: assert internal objects implement interfaces
2016-12-15 18:34:57 -08:00
1c1cf2faf7
Merge branch 'master' into interface-checks
2016-12-15 18:20:34 -08:00
ef00f717a6
Merge pull request #341 from dcbw/host-local-trim
...
host-local: trim whitespace from container IDs and disk file contents
2016-12-15 18:18:25 -08:00
5852c60bc4
all: assert internal objects implement interfaces
2016-12-14 17:09:01 -06:00
20ae9e156d
Merge pull request #340 from vzcambria/master
...
Fix README.md host-local IPAM range start/end typo
2016-12-09 18:22:08 -06:00
76028d7f8c
host-local: trim whitespace from container IDs and disk file contents
...
It doesn't seem like container IDs should really have whitespace or
newlines in them. As a complete edge-case, manipulating the host-local
store's IP reservations with 'echo' puts a newline at the end, which
caused matching to fail in ReleaseByID(). Don't ask...
2016-12-09 18:16:38 -06:00
2ba6d20007
Fix README.md host-local IPAM range start/end typo
2016-12-06 10:40:55 -05:00
accac60053
plugins/noop: return a helpful message for test authors
...
Signed-off-by: Gabe Rosenhouse <grosenhouse@pivotal.io >
2016-12-02 15:04:01 -08:00
b0808a006a
Merge pull request #335 from JulienBalestra/json_ext
...
libcni conf: support .json file extension
2016-12-02 13:33:36 -06:00
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
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
6eac0ee904
flannel: rename stateDir to dataDir
...
Rename StateDir to DataDir for flannel CNI plugin
2016-11-17 15:54:29 -06:00
46e3a6b7be
Merge pull request #330 from bboreham/ns-warning
...
Expand description of goroutine+netns problems
2016-11-17 08:00:31 -08:00
c20f895fa8
Expand description of goroutine+netns problems
2016-11-17 15:45:38 +00:00
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
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
8b827d74b3
Merge pull request #328 from markstgodard/noop-cni-args
...
noop plugin: support multiple CNI_ARGS
2016-11-10 22:24:58 -08:00
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
7b2006eed8
Merge pull request #324 from lstoll/lstoll-ipvlan-l3s
...
ipvlan: Support L3-Symmetric mode
2016-11-10 12:53:59 -06:00
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
e6113c6517
flannel: update flannel documentation
...
add optional 'stateDir' to flannel docs
2016-11-09 09:34:35 -06:00
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
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
9201f3f1d9
ipvlan: Support ipvlan l3s mode.
...
This landed in kernel in 4fbae7d
2016-11-05 13:41:07 -07:00
2ad1d04561
vendor: github.com/vishvananda/netlink@a1f8555
...
Update to current master, to get IPVLAN L3s def.
2016-11-05 13:41:01 -07:00
