intel / multus-cni

55%

master: 71%

LAST BUILD ON BRANCH fix/restart-node-2

branch: fix/restart-node-2

CHANGE BRANCH

x

Reset

• fix/restart-node-2
• dev/checkpoint_deviceinfo
• dev/defaultnet
• dev/dockerfile-improvements
• dev/k8s-deviceid-model
• dev/mac
• dev/update-readme
• develop-4.0
• dockerfile-move
• entrypoint-newsleep
• fix/e2e
• fix/restart-node-1
• fix/travisci
• fix/update_examples
• kube-1.16-change
• master
• rebase-b-develop-4.0
• rebase/k8s-deviceid-model
• refs/tags/v3.4.1
• refs/tags/v3.4.2
• refs/tags/v3.6
• refs/tags/v3.7
• release-3.1
• release-3.5
• release-3.6
• release-3.7
• release-test
• release-v3
• release-v3-experimental-grpc
• revert-307-deviceid
• travis-ci
• upgrade-grpc
• v3.1
• v3.2
• v3.2.1
• v3.3
• v3.3-tp
• v3.4

Build # 780

Build Type

Pull #327

travis-ci

Committed by web-flow

Commit Message

CNIVersion fix for conflist

This change introduces two fix about CNIVersion. One is to add CNIVersion into
delegated CNI conflist in case of DEL if CNIVersion is missing. ParseVersion() in libcni
checks cniVersion as mandatory field and sometimes user/daemonset miss it.
The latest flannel daemonset yaml (of flannel github) does not have CNIVersion, for example.
This change adds CNIVersion from multus config if cniVersion is missing (empty) in delegated
CNI config.

In addition, this fix also adds '--cni-version' in entrypoint.sh to add cniVersion in multus
config in case of '--multus-conf-file=auto'.

Pull Request Pull Request #327: CNIVersion fix for conflist

Run Details

5 of 5 new or added lines in 1 file covered. (100.0%)

702 of 1282 relevant lines covered (54.76%)

3.92 hits per line