15894b36a0
Merge pull request #397 from oshothebig/install-cnitool
...
contributing doc: describe cnitool installation
2019-10-07 14:27:23 +02:00
77b51f0bc9
contributing doc: describe cnitool installation
...
cnitool must be installed before running tests because cnitool is
invoked during the tests
Signed-off-by: Sho SHIMIZU <sho.shimizu@gmail.com >
2019-10-07 17:42:44 +09:00
bd63528b0b
contributing doc: revise test script name to run
...
test.sh doesn't exists now as it was separated into two OS-specific
scripts in 4e1f7802dbsho.shimizu@gmail.com >
2019-10-04 18:32:12 +09:00
cf187287af
Update tests for uint64
...
Signed-off-by: Ashley Reese <ashley@victorianfox.com >
2019-10-03 16:55:41 +02:00
0dff883769
Use uint64 for Bandwidth plugin
...
Signed-off-by: Ashley Reese <ashley@victorianfox.com >
2019-10-03 16:05:27 +02:00
d0eeb27494
Merge pull request #390 from sipsma/firewall-fix
...
firewall: don't return error in DEL if prevResult is not found.
2019-10-02 10:38:47 -05:00
e70558cbe1
bridge: check vlan id when loading net conf
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-09-30 17:12:31 +08:00
0a1421a08c
firewall: remove unused netns check from DEL method
...
Signed-off-by: Erik Sipsma <sipsma@amazon.com >
2019-09-25 20:38:02 +00:00
0f19aa2f8d
Merge pull request #388 from sipsma/fix-ptpdns
...
ptp: only override DNS conf if DNS settings provided
2019-09-25 17:43:24 +02:00
e91889678b
Merge pull request #391 from beautytiger/dev-190925
...
bugfix: defer after err check, or it may panic
2019-09-25 16:25:21 +01:00
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
fc7059c1ae
firewall: don't return error in DEL if prevResult is not found.
...
The CNI spec states that for DEL implementations, "when CNI_NETNS and/or
prevResult are not provided, the plugin should clean up as many resources as
possible (e.g. releasing IPAM allocations) and return a successful response".
This change results in the firewall plugin conforming to the spec by not
returning an error whenever the del method is not provided a prevResult.
Signed-off-by: Erik Sipsma <sipsma@amazon.com >
2019-09-23 21:11:07 +00:00
a96c469e62
ptp: only override DNS conf if DNS settings provided
...
Previously, if an IPAM plugin provided DNS settings in the result to the PTP
plugin, those settings were always lost because the PTP plugin would always
provide its own DNS settings in the result even if the PTP plugin was not
configured with any DNS settings.
This was especially problematic when trying to use, for example, the host-local
IPAM plugin's support for retrieving DNS settings from a resolv.conf file on
the host. Before this change, those DNS settings were always lost when using the
PTP plugin and couldn't be specified as part of PTP instead because PTP does not
support parsing a resolv.conf file.
This change checks to see if any fields were actually set in the PTP plugin's
DNS settings and only overrides any previous DNS results from an IPAM plugin in
the case that settings actually were provided to PTP. In the case where no
DNS settings are provided to PTP, the DNS results of the IPAM plugin (if any)
are used instead.
Signed-off-by: Erik Sipsma <sipsma@amazon.com >
2019-09-18 21:09:22 +00:00
291ab6cc84
Merge pull request #386 from janisz/patch-1
...
Bump Go version
2019-09-18 17:12:43 +02:00
90125f40ba
Bump Go version
...
Signed-off-by: Tomasz Janiszewski <janiszt@gmail.com >
2019-09-18 11:20:33 +02:00
23d5525ec3
Merge pull request #383 from mccv1r0/issue381
...
When prevResults are not supplied to loopback plugin, create results to return
2019-09-11 11:11:55 -05:00
fd42109a06
When prevResults are not returned to loopback plugin, create results to return based on
...
the lo interface and IP address assigned inside container.
Signed-off-by: Michael Cambria <mcambria@redhat.com >
2019-09-11 11:57:03 -04:00
4bb288193c
Merge pull request #379 from xcelsion/fix-host-container-address-family-mismatch
...
Fix dual-stack support in meta/portmap
2019-09-11 17:16:36 +02:00
e8365e126d
Fixed issue where hostIP address family was not checked against the containerIP address family. closes #378
...
Signed-off-by: Niels van Oosterom <xcelsion@users.noreply.github.com >
2019-09-06 15:23:00 +02:00
7e68430081
Merge pull request #377 from mars1024/bumpup/to/0.7.1
...
bump up libcni to v0.7.1
2019-08-28 10:55:43 -05:00
f81a529ebd
Merge pull request #375 from smarkm/master
...
Fixes #342 , cleanup netns after test suite
2019-08-28 17:55:36 +02:00
630a4d8db6
Merge pull request #374 from mars1024/feat/loopback_support_check
...
loopback support CNI CHECK and result cache
2019-08-28 10:53:43 -05:00
3d56f7504d
loopback plugin support to pass previous result transpartently
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-08-23 22:56:22 +08:00
659a09f34e
loopback support CNI CHECK
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-08-23 20:36:37 +08:00
b76ace9c64
bump up libcni to v0.7.1
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-08-23 20:24:16 +08:00
0d0dcfc02f
Cleanup netns after test suit
...
Signed-off-by: smarkm <smark@freecoop.net >
2019-08-22 08:10:35 +08:00
485be65581
Merge pull request #372 from squeed/fix-build
...
win-bridge, win-overlay: remove extra import
2019-08-14 11:26:26 -07:00
ca82120019
win-bridge, win-overlay: remove extra import
2019-08-14 18:15:23 +02:00
c9e1c0c1ed
Merge pull request #281 from s1061123/dev/support-args
...
Support "args" in static and tuning
2019-08-14 17:43:04 +02:00
2d6d4b260a
Merge pull request #366 from Random-Liu/fix-bridge-race
...
Fix: failed to set bridge addr: could not add IP address to \"cni0\": file exists
2019-08-12 13:08:32 +02:00
ad7c1d189b
Fix a race condition in the bridge plugin.
...
Signed-off-by: Lantao Liu <lantaol@google.com >
2019-08-09 17:08:04 -07:00
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
ccd683e1a3
Merge pull request #357 from mars1024/bugfix/host-device
...
host-device: revert name setting to make retries idempotent
2019-08-07 08:54:26 -07:00
a11cb626b0
Merge pull request #331 from nagiesek/LoopbackDsr
...
Loopback dsr & L2Tunnel
2019-08-07 17:48:00 +02:00
f36dbc2031
Merge pull request #358 from mccv1r0/ipt-vendor
...
Vendor update go-iptables
2019-08-07 10:40:26 -05:00
e9d511c5bc
Merge pull request #364 from s1061123/fix/removeifdown
...
Remove link Down/Up in MAC address change to prevent route flush
2019-08-07 17:39:02 +02:00
91a68d56f9
Vendor update go-iptables to obtain commit f1d0510cabcb710d5c5dd284096f81444b9d8d10
...
Update go.mod & go.sub
2019-08-07 10:56:30 -04:00
8902d2614a
Remove link Down/Up in MAC address change to prevent route flush
2019-08-07 13:54:10 +09:00
df9af9ab41
[Windows] Adds optional loopbackDSR argument to cni config.
...
Adds a bool to the cni config that will add a policy that allows for loopbackDSR on an interface. Updates relevant documentation. Allows L2Tunnel networks to be used for L2Bridge plugin.
2019-07-31 15:45:54 -07:00
5e2e365291
host-device: remove useless Expects in testcases
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-07-29 21:09:03 +08:00
4b68f56820
host-device: add testcases for imdempotence of CmdDel
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-07-29 20:47:28 +08:00
ded2f17577
Merge pull request #328 from mars1024/feature/hostlocal_idempotent
...
host-local support idempotent allocation
2019-07-24 17:32:15 +02:00
57650a1e5b
host-device: revert name setting to make retries idempotent
...
Signed-off-by: Bruce Ma <brucema19901024@gmail.com >
2019-07-19 21:26:07 +08:00
7ba2bcfeab
Merge pull request #353 from cf-container-networking/fix-hash-func
...
Increase IfbDeviceName size and refactor hashing functions, fix
2019-07-18 17:12:53 -04:00
3fb8dcfd4c
pkg/meta/bandwidth: increase IfbDeviceName size
...
* Increase entroy from 2 bytes to 7 bytes to prevent collisions
* Extract common library function for hash with prefix
* Refactor portmap plugin to use library function
fixes #347
Co-authored-by: Cameron Moreau <cmoreau@pivotal.io >
Co-authored-by: Mikael Manukyan <mmanukyan@pivotal.io >
2019-07-18 11:45:38 -07:00
966bbcb8a5
Merge pull request #348 from cf-container-networking/update-vagrantfile
...
update Go version in Vagrantfile
2019-07-10 10:04:52 -05:00
7d76537d4a
Merge pull request #349 from cf-container-networking/fix-ip-test
...
pkg/ip unit test: be agnostic of Linux version
2019-07-10 10:04:32 -05:00
f3b1ffc960
pkg/ip unit test: be agnostic of Linux version
...
on Linux 4.4 the syscall error message is "invalid argument" not "file
exists"
Co-authored-by: Gabe Rosenhouse <grosenhouse@pivotal.io >
2019-07-09 16:58:57 -07:00
ce9560712e
update Go version in Vagrantfile
...
update go to the lastest version v1.12.7
Co-authored-by: Gabe Rosenhouse <grosenhouse@pivotal.io >
2019-07-09 16:51:00 -07:00
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
