21d96393ea
Merge pull request #391 from tangle329/master
...
Validate rangeStart and rangeEnd specified in conf
2017-04-24 22:00:07 -05:00
9445711fa5
spec/plugins: fix 'ip'->'ips' in the spec, bump to 0.3.1
2017-04-05 12:46:24 -05:00
0799f5732f
Merge pull request #412 from tomdee/safe-del
...
plugins/*: Don't error if the device doesn't exist
2017-03-22 09:47:29 -07:00
13824487c6
plugins/*: Don't error if the device doesn't exist
...
I wasn't able to test or update the dhcp plugin but from a code read it
should be fine. All the other plugins are tested and fixed
2017-03-22 08:52:29 -07:00
699380d687
Merge pull request #407 from aaronlevy/del-err
...
plugins/meta/flannel: If net config is missing do not return err on DEL
2017-03-21 10:43:40 -07:00
74d4cbed76
plugins/meta/flannel: If net config is missing do not return err on DEL
2017-03-17 13:37:33 -07:00
e4a0583d7a
pkg/ip: SetupVeth returns net.Interface
2017-03-10 09:49:46 -08:00
1b65890795
Validate rangeStart and rangeEnd specified in conf
...
Signed-off-by: Tang Le <tangle3@wanda.cn >
2017-03-10 12:51:05 +08:00
58c834c4f3
pkg/ip: do not leak types from vendored netlink package
...
The exported function SetupVeth now returns a package-defined type.
Signed-off-by: Gabe Rosenhouse <grosenhouse@pivotal.io >
2017-03-09 13:55:15 -08:00
4ce9b019aa
Merge pull request #366 from ehazlett/ipam-host-local-initial-reserved-ip
...
Do not error if last reserved not found after initial creation
2017-03-06 07:13:06 -08:00
ac50624393
fix unrelated failing tests
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2017-03-02 15:37:43 -05:00
2678be24d0
add test for ensuring initial subnet creation does not contain an error
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2017-03-02 15:16:09 -05:00
474ba16901
do not error if last_reserved_ip is missing for host local ipam
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2017-03-02 13:59:21 -05:00
1003822e53
Check n.IPAM before use it in LoadIPAMConfig function
...
Signed-off-by: Tang Le <tangle3@wanda.cn >
2017-03-02 10:25:19 +08:00
7fa16f18d9
plugins/main/ptp: set the Sandbox property on the response
2017-02-21 00:28:19 +01:00
eb2ff7fe57
docs: consolidate host-local documentation
...
- remove the README.md in the plugins/ipam/host-local (no other plugin
has this)
- merge that info into the main Documentation/host-local.md
2017-02-15 15:20:13 -08:00
d5acb127b8
spec/plugins: return interface details and multiple IP addresses to runtime
...
Updates the spec and plugins to return an array of interfaces and IP details
to the runtime including:
- interface names and MAC addresses configured by the plugin
- whether the interfaces are sandboxed (container/VM) or host (bridge, veth, etc)
- multiple IP addresses configured by IPAM and which interface they
have been assigned to
Returning interface details is useful for runtimes, as well as allowing
more flexible chaining of CNI plugins themselves. For example, some
meta plugins may need to know the host-side interface to be able to
apply firewall or traffic shaping rules to the container.
2017-01-25 11:31:18 -06:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a29fc24f11
Merge pull request #296 from rosenhouse/plugins-require-versioned-config
...
Plugins validate cniVersion of NetConf
2016-09-22 17:11:34 -05:00
52e4358cbd
host-local: fix allocation of last address in a /30
2016-09-21 13:10:05 -07:00
0135e2751e
versioning: ipam config is not versioned
2016-09-19 13:25:28 -07:00
fd150a4c97
skel: Plugins require a cniVersion in the NetConf
2016-09-18 21:30:57 -07:00
56032390fe
Merge pull request #287 from rosenhouse/multi-version
...
Plugins report a list of supported versions
2016-09-12 13:44:14 -07:00
7958b9f0cc
versioning: revert spec version to 0.2.0
2016-09-06 15:37:42 -04:00
d5e2e375d4
versioning: misc cleanups
...
highlights:
- NetConf struct finally includes cniVersion field
- improve test coverage of current version report behavior
- godoc a few key functions
- allow tests to control version list reported by no-op plugin
2016-09-06 15:35:58 -04:00
95a9ea0bd2
host-local: don't allocate the broadcast address or allow invalid networks
...
There aren't any IPs to allocate in /32 or /31 networks, so don't allow them.
2016-09-02 17:20:09 -05:00
