ITQC/containernetworking-plugins
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity
1,412 Commits 6 Branches 48 Tags
820fee9c330432fb032fc0eaeadc35b7985f5acf
Commit Graph

148 Commits

Author SHA1 Message Date
Casey Callendrello b41052c547 Merge pull request #593 from thetechnick/ipam-static-nil-check-fix 
Fix nil-pointer check
 2021-04-14 18:00:42 +02:00
Nico Schieder 8f32968f73 Fix nil-pointer check 
Signed-off-by: Nico Schieder <nschieder@redhat.com>
 2021-04-13 13:42:23 +02:00
Sebastiaan van Stijn bc856372bb go.mod: godbus/dbus/v5 v5.0.3, coreos/go-systemd v22.2.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-09 00:07:25 +02:00
Kavya 5b02c2ab70 Fix broken links to online docs in plugin READMEs 
Signed-off-by: Kavya <kavya.g@ibm.com>
 2021-03-25 13:07:33 +05:30
Bruce Ma b811967444 remove redundant startRange in RangeIter due to overlap check on multi ranges 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
 2021-03-04 11:50:54 +08:00
Dan Williams 02cdaafe93 host-local: increase test coverage to 1.0.0 and older spec versions 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2021-02-12 14:56:24 -06:00
Dan Williams f534133ec7 static: increase test coverage to 1.0.0 and older spec versions 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2021-02-12 14:41:38 -06:00
Dan Williams 932653fd3f dhcp: increase test coverage to 1.0.0 and older spec versions 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2021-02-12 14:41:38 -06:00
Dan Williams dd3f6064f6 dhcp: add -resendmax option to limit lease acquisition time for testcases 
The default lease acquisition timeout of 62 seconds is way too long when
running multiple testcases, overrunning the `go test` timeout of 10m. Let
testcases specify a shorter timeout.

Signed-off-by: Dan Williams <dcbw@redhat.com>
 2021-02-12 14:41:38 -06:00
Dan Williams 7d8c767622 plugins: update to spec version 1.0.0 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2021-02-11 23:27:08 -06:00
Micah Hausler fa48f7515b ipam/dhcp: Add broadcast flag 
Signed-off-by: Micah Hausler <hausler.m@gmail.com>
 2021-02-05 16:38:32 +01:00
toby lorne a8d1f5cd1b dhcp: default dhcp clien timeout is 10s 
Consistent with https://github.com/d2g/dhcp4client/blob/ef524ad9cb076fe235ecc3c55913ef8445fa35fa/client.go#L39

Signed-off-by: toby lorne <toby@toby.codes>
Co-authored-by: bruce ma <brucema19901024@gmail.com>
 2021-01-13 19:24:41 +00:00
toby lorne 25fc741e37 dhcp: daemon dhcp client timeout is configurable 
Fixes #470

Signed-off-by: toby lorne <toby@toby.codes>
 2021-01-11 22:13:54 +00:00
toby lorne 3161bb52e0 dhcp: timeout value is set in DHCP daemon 
Eventually the timeout value will become a CLI argument

The default timeout was nestled all the way in the lease constructor

This commit is the first step in making the timeout configurable by
moving it to the DHCPLease constructor

Signed-off-by: toby lorne <toby@toby.codes>
 2021-01-11 22:13:54 +00:00
yuzhiquan ebce6d0b9b remove unused function 
Signed-off-by: yuzhiquan <yuzhiquanlong@gmail.com>
 2021-01-11 11:12:00 +08:00
Nate W cccf5395e8 Updating plugin README.md files (#549) 
Removing content and pointing at the new website as a part of the CNI Documentation migration.

Signed-off-by: Nate W <4453979+nate-double-u@users.noreply.github.com>
 2020-11-18 17:38:45 +01:00
xieyanker 50a3aa6536 Xdhcp: fix example configuration 
The current cni config has an extra comma and cannot be parsed normally, the kubelet will report an error as follows:
"Error loading CNI config file: error parsing configuration: invalid character '}' looking for beginning of object key string"

Signed-off-by: xieyanker <xjsisnice@gmail.com>
 2020-11-10 07:48:36 +00:00
Aneesh Puttur d4775ecff5 Fix handling of delay in acquiring lease with stp turned on 
Signed-off-by: Aneesh Puttur <aneeshputtur@gmail.com>
 2020-06-29 13:15:00 -04:00
Tomofumi Hayashi 2290fc8d8a static: prioritize the input sources for IPs 
This change introduce priorities for IPs input among CNI_ARGS,
'args' and runtimeConfig. Fix #399.

Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>
 2019-10-17 13:36:49 +09:00
Guangming Wang 8ec6bd6a42 bugfix: defer after err check, or it may panic 
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
 2019-09-25 22:21:49 +08:00
Tomofumi Hayashi a069a5f1a3 Support "args" in static and tuning 
Support "args" field in JSON config to additional configuration
in static and tuning plugins.
 2019-08-09 11:52:06 +09:00
Bruce Ma e2984e7840 host-local: return error if duplicate allocation is requested for a given ID 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
 2019-07-06 10:05:18 +08:00
Bruce Ma eb1ff18c4c host-local: add some testcases for allocation idempotency 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
 2019-07-06 09:39:56 +08:00
Bruce Ma e8771b36a2 host-local: make allocation idempotent to multiple requests with same id 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
 2019-07-06 09:39:56 +08:00
Bruce Ma 7f8ea631e5 host-local: make Store interface support to get ip list by id 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
 2019-07-06 09:39:56 +08:00
Tomofumi Hayashi 660685a8af Support ips capability in static and mac capability in tuning 
This change introduces new capability flag to change MAC address
and to specify IP addresses by tuning and static.
 2019-06-20 17:11:47 +09:00
Casey Callendrello 72f2a1ffd4 plugins: correctly output build version, cosmetic cleanups 
Now that libcni has the ability to print a version message, plumb it
through correctly.

While we're at it,
- fix import paths
- run gofmt
- add some more comments to sample
- add container runtime swappability for release
 2019-04-15 16:52:07 +02:00
Casey Callendrello fbd9accd14 Merge pull request #268 from s1061123/fix/dhcp_daemon_hostprefix 
Fix -hostprefix option
 2019-04-08 12:53:09 +02:00
Tomofumi Hayashi 8b53f80fa8 Incorporate with @bboreham comment 2019-04-05 03:38:20 +09:00
Dan Williams 18874aac7d Merge pull request #264 from mccv1r0/add-check 
Add CHECK support for linux plugins
 2019-04-03 12:58:41 -05:00
Michael Cambria 74a2596573 Add check support for: bridge, ipvlan, macvlan, p2p, vlan and host-device main plugins 
host-local and static ipam plugins
  tuning, bandwidth and portmap meta plugins

  Utility functions created for common PrevResult checking

  Fix windows build
 2019-04-03 13:08:07 -04:00
Dan Williams 8a3d149a60 Merge pull request #284 from francares/fmc_dhcp_subnetmask 
IPAM/DHCP: include Subnet Mask option parameter in DHCPREQUEST
 2019-04-01 14:56:13 -05:00
Casares, Francisco M d577d9cc24 DHCP: include Subnet Mask option parameter in DHCPREQUEST 
DHCP REQUEST from DHCP plugin does not include Subnet Mask option parameter (1). Some DHCP servers need that option to be explicit in order to return it in a DHCPACK message.
If not, DHCP plugin returns "DHCP option Subnet Mask not found in DHCPACK" error msg in this type of scenario.
 2019-03-26 12:49:48 -07:00
Tomofumi Hayashi 4ec62ac295 Fix -hostprefix option 
Fix #267
 2019-03-26 18:27:46 +09:00
Tomofumi Hayashi b1814d7f9a Add systemd unit file to activate socket with systemd 
This changes to add sample systemd unit files to activate socket
with systemd. Fix #156.
 2019-03-14 16:03:23 +09:00
Nguyen Quang Huy 4bca3e76bf Fix redundant import alias 
Because these package names are short and they are unique, it can not conflict. So the import aliases that can be omitted and we should remove them.
 2019-02-20 16:58:45 +07:00
Saravana Periyasamy f891fd9e9a some DHCP servers expect to request for explicit router options 2019-01-28 19:44:53 -06:00
Dan Williams a686cc4bd8 Merge pull request #248 from JoeWrightss/patch-1 
Fix some spelling errors
 2019-01-09 09:50:38 -06:00
JoeWrightss f0208611ad Fix some spelling errors 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-29 21:26:28 +08:00
bingshen.wbs 59a746bd52 remove gateway check 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2018-11-29 12:59:38 +08:00
Michael Cambria 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
Michael Cambria 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
Michael Cambria d2ebd0a4c2 Merge branch 'master' of github.com:containernetworking/plugins into issue164 2018-10-10 12:28:43 -04:00
Michael Cambria 22b11bb367 Keep defaultSocketPath the same as before 2018-10-10 11:35:57 -04:00
Michael Cambria 73106f0ece Remove unused pidfilePath const 
Moved global var's to BeforeEach()
 2018-10-09 16:57:58 -04:00
Michael Cambria 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
Michael Cambria 37715a0f87 Moved directory walk, compare file code to it's own function 2018-10-09 13:13:36 -04:00
Michael Cambria 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
Michael Cambria 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
Michael Cambria ef913eadd5 Took out os.Remove() for socketPath and pidfilePath now that os.RemoveAll() is used 2018-10-08 16:01:31 -04:00