Commit Graph

1656 Commits

Author SHA1 Message Date
f5c451f719 remove changing
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2019-01-04 01:14:56 +08:00
f0208611ad Fix some spelling errors
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-29 21:26:28 +08:00
ee819c71a1 Merge pull request #246 from pivotal-k8s/windows-travis
Move Windows tests to Travis
2018-12-19 10:38:24 -06:00
4371665606 Merge pull request #236 from BSWANG/master
remove gateway check
2018-12-12 18:41:02 +01:00
d0a28ce5f7 Merge pull request #239 from sufuf3/fix-typo
Fix typo from userful to useful in README
2018-12-12 08:14:24 -08:00
34b1b702dc Move Windows tests to Travis 2018-12-10 14:43:32 -08:00
35451e67e2 Fix typo from userful to useful in README 2018-12-03 14:35:19 +08:00
59a746bd52 remove gateway check
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2018-11-29 12:59:38 +08:00
3fb464786f Merge pull request #195 from SchSeba/l2-bridge
L2 bridge Implementation
2018-11-21 08:41:24 -08:00
72251a67b5 Merge pull request #217 from mccv1r0/dhcpif
Add container ifName to the dhcp clientID, making the clientID value
2018-11-21 10:34:10 -06:00
b75d14ab84 Merge pull request #234 from plwhite/vagrant
Tweak contributing instructions to clarify how to run tests.
2018-11-21 10:22:16 -06:00
bf47e9aa1b Allow L2 connection for the bridge cni plugin. 2018-11-21 17:57:10 +02:00
251a00e6b4 Tweak contributing instructions to clarify how to run tests. 2018-11-19 14:39:39 +00:00
0af31fc4d0 Change dhcp plugin to send ClientID allowing container to have multiple CNI
interfaces using dhcp ipam.

Vendor latest dhcp4server, dhcp4client, dhcp4

Added additional tests for new functionality in dhcp2_test.go

Wrap d2g dhcp4client calls with our own which add clientID to packet.
2018-11-15 11:31:56 -05:00
227a4c15fa Add container ifName to the dhcp clientID, making the clientID value
now equal to: ContainerID / Host Network / ifname inside container

Use clientID as a key for the lease
2018-11-09 17:27:05 -05:00
073df9a04d Merge pull request #219 from pivotal-k8s/master
Make build.sh work for windows plugins.
2018-11-07 08:25:25 -08:00
71e026426f Merge pull request #227 from mccv1r0/check-vendor
Vendor github.com/containernetworking/cni libcni and pkg
2018-11-07 16:14:39 +00:00
5fc8209482 Merge pull request #218 from hwchiu/fix-readme
fix the typo of macvlan and also modify documents to meet the current plugins.
2018-11-07 09:30:29 -06:00
534bfafe99 Merge pull request #220 from hwchiu/host-device-support-ipam
Support the IPAM in the host-device
2018-11-07 09:29:58 -06:00
44757b95ef Merge pull request #223 from rosenhouse/bump-to-go-1.11
bump travis and vagrantfile to go 1.11
2018-11-07 09:28:42 -06:00
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