Commit Graph

1736 Commits

Author SHA1 Message Date
6f3332e9fe Fix for windows too 2018-11-05 16:52:12 -05:00
ddbf22f7f9 Vendor github.com/containernetworking/cni libcni and pkg file needed for CHECK
Update plugins/tests to deal with changes made to this vendor'ed code
2018-11-05 16:35:03 -05:00
4e1f7802db Split build.sh into two OS-specific scripts 2018-11-01 16:41:31 -04:00
d3284f7c5e Support the IPAM for host-device plugin
- Change variable name to camel style to fix golint warning
- Execute the IPAM to assign the IP address if it's inside in the config
- Test the IPAM module with static plugin
2018-11-01 01:12:47 +00:00
ee57f675ad bump travis and vagrantfile to go 1.11 2018-10-31 08:53:28 -07:00
f006155b66 Add the missing documents for some existing plugins 2018-10-18 02:20:52 +00:00
2d03820ebb Make build.sh work for windows plugins.
When building the windows plugin exe's (host-local, flannel, win-overlay, win-bridge),
it was necessary to use 'GOOS=windows go build path/to/plugin' rather than the build script.

This makes 'GOOS=windows GOARCH=amd64 ./build.sh' build all the windows plugin binaries.
2018-10-17 16:44:57 -07:00
e3ec4a74d0 fix the typo, we use the passthru in the macvlan.go 2018-10-17 17:15:43 +00:00
b93d284d18 Merge pull request #213 from Random-Liu/handle-empty-netns
Handle empty netns in DEL for `loopback` and `host-device`.
2018-10-17 10:21:29 -05:00
3129152706 Merge pull request #216 from plwhite/dco
Add missing DCO
2018-10-17 10:05:45 -05:00
9abd20edd6 Add missing DCO
DCO referenced from CONTRIBUTING.md did not exist. Add it.
2018-10-11 16:15:24 +01:00
2955d63c95 Handle empty netns in DEL for loopback and host-device.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-10 10:49:06 -07:00
a326f9d3f8 Merge pull request #203 from mccv1r0/issue164
host-local: add ifname to file tracking IP address used
2018-10-10 11:55:47 -05:00
3072177d0e Merge branch 'issue164' of github.com:mccv1r0/plugins into issue164 2018-10-10 12:32:34 -04:00
d2ebd0a4c2 Merge branch 'master' of github.com:containernetworking/plugins into issue164 2018-10-10 12:28:43 -04:00
f879dad626 Merge pull request #207 from mccv1r0/vendorfix
Fix vendor regression in dhcp4server
2018-10-10 10:50:53 -05:00
22b11bb367 Keep defaultSocketPath the same as before 2018-10-10 11:35:57 -04:00
396f51afab Merge branch 'vendorfix' of github.com:mccv1r0/plugins into vendorfix 2018-10-09 16:59:01 -04:00
73106f0ece Remove unused pidfilePath const
Moved global var's to BeforeEach()
2018-10-09 16:57:58 -04:00
bf31f08981 Remove unused pidfilePath const 2018-10-09 16:39:06 -04:00
75e35b6c01 Added new test cases.
Add two interfaces (e.g. eth0, eth1) to the same container.
Ensure each file now has ContainerID and ifname.
Delete one, ensure that the right file was deleted.

Add an interface using just ContainerID in the file.
Delete to verify we are still backwards compatible with any
files created using earlier verison of host-local plugin.
2018-10-09 13:13:36 -04:00
37715a0f87 Moved directory walk, compare file code to it's own function 2018-10-09 13:13:36 -04:00
a17cadda88 Handle the case of a Delete for a reservation stored with just ContainerID without the interface 2018-10-09 13:13:36 -04:00
1e8f9525a6 Obtain ifname from CmdArgs and pass to backend Add ifname to second line of file tracking the IP address used by ContainerID
Update host-local tests to use ifname along with ContainerID
in store file

Signed-off-by: Michael Cambria <mcambria@redhat.com>
2018-10-09 13:13:36 -04:00
ef913eadd5 Took out os.Remove() for socketPath and pidfilePath now that os.RemoveAll() is used 2018-10-08 16:01:31 -04:00
3d349e4645 Ensure /run/cni exists in the filesystem before running dhcp tests 2018-10-08 14:08:37 -04:00
3de323f3f0 Enable ginkgo parallelization in test.sh 2018-10-08 11:32:08 -04:00
5fd849ac6d Use tempDir in socket path for ginkgo parallelization 2018-10-08 11:31:03 -04:00
6d3215a256 Allow socket path used by dhcp plugin to be supplied via dhcp ipam configuration
Allow socket path to be supplied as flag when starting dhcp daemon
2018-10-08 11:30:01 -04:00
726759b29b Merge pull request #209 from angelachin/readme-bandwidth-update
Updated README to include bandwidth plugin
2018-10-05 10:02:21 -07:00
66837d6f3b Remove -p from test.sh
Running ginkgo tests in parallel causes problems with dhcp_test.go.

BeforeEach() is run once for each spec before any actual dhcp test starts.
This results in setting up two dhcp4servers that run concurrently.
Both try to Listen and use unix socketPath file /run/cni/dhcp.sock at the same time.

AfterEach() for one test runs when test completes, deleting /run/cni/dhcp.sock.
But other test still needs the file resulting in test failing.  Often, the next dhcp
test hasn't started yet.  When test does start it waits 15 seconds for dhcp4server to
create /run/cni/dhcp.sock (which has just been deleted) so test fails.

Other times dhcp tests fail because /run/cni/dhcp.sock is deleted while still being used.
2018-10-01 16:12:07 -04:00
1e4d47fc35 Fix vendor regression in dhcp4server 2018-09-27 11:04:14 -04:00
0fbc611121 Added new test cases.
Add two interfaces (e.g. eth0, eth1) to the same container.
Ensure each file now has ContainerID and ifname.
Delete one, ensure that the right file was deleted.

Add an interface using just ContainerID in the file.
Delete to verify we are still backwards compatible with any
files created using earlier verison of host-local plugin.
2018-09-25 16:17:18 -04:00
9959f787e8 Moved directory walk, compare file code to it's own function 2018-09-25 12:10:36 -04:00
646dbbace1 Merge pull request #165 from s1061123/dev/static-args
Support CNI_ARGS in static IPAM plugin
2018-09-24 21:00:09 -05:00
9b86f52791 Merge pull request #200 from s1061123/fix/tuning-doc
Add description for mac/mtu/promisc in tuning README.md
2018-09-24 20:53:38 -05:00
8a579a7fbc Merge pull request #204 from mrostecki/always-check-err
Add missing error checks
2018-09-24 20:52:38 -05:00
a8ad12dd7a Merge pull request #193 from thxCode/windows_cni
Windows CNI support
2018-09-20 15:16:52 -05:00
b56ca2fe45 Windows Support
Patch for https://github.com/containernetworking/plugins/pull/85

+ Windows cni plugins are added
   (*) win-bridge (hostgw)
   (*) win-overlay (vxlan)
+ Windows netconf unit test
+ Fix appveyor config to run the test
+ Build release support for windows plugins

Address comments

From:
    - https://github.com/containernetworking/plugins/pull/85
    - 0049c64e3f
2018-09-21 00:34:07 +08:00
e1d29e9fe4 Update Vendor
(*) github.com/Microsoft/hcsshim
    (*) golang.org/x/sys
    (*) github.com/x/cyrpto
    (*) github.com/sirupsen/logrus
    (*) github.com/Microsoft/go-winio
    (*) github.com/juju/errors
    (*) github.com/buger/jsonparser
2018-09-21 00:34:07 +08:00
7b72f2afd4 Handle the case of a Delete for a reservation stored with just ContainerID without the interface 2018-09-20 10:56:07 -04:00
93178bf026 Fix typo. 2018-09-20 22:18:15 +09:00
f5f787057d plugins/meta: Add missing error checks
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:06:50 +02:00
8c61a2c2f3 plugins/main: Add missing error checks
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:06:28 +02:00
1a3f49c7ae plugins/ipam: Add missing error check
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:05:58 +02:00
947a5881fc pkg/ns: Add missing error checks
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:05:15 +02:00
26834c3e63 pkg/ip: Add missing error check
Signed-off-by: Michal Rostecki <mrostecki@suse.de>
2018-09-20 11:04:13 +02:00
f1ee2cc614 Obtain ifname from CmdArgs and pass to backend Add ifname to second line of file tracking the IP address used by ContainerID
Update host-local tests to use ifname along with ContainerID
in store file

Signed-off-by: Michael Cambria <mcambria@redhat.com>
2018-09-18 16:35:30 -04:00
d22e75316f Incorporate comments in PR. 2018-09-13 01:49:47 +09:00
094c903932 Incorporate Dan's comments. 2018-09-13 01:46:11 +09:00