Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cnitool: add support for CNI_ARGS #482

Merged
merged 1 commit into from
Jul 12, 2017
Merged

Conversation

feiskyer
Copy link
Contributor

This PR add CNI_ARGS support in cnitool, so as to facilitate plugins required this environment variable.

@feiskyer
Copy link
Contributor Author

cc @squeed @dcbw

cnitool/cni.go Outdated
pairs := strings.Split(args, ";")
for _, pair := range pairs {
kv := strings.Split(pair, "=")
if len(kv) != 2 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be if len(kv) != 2 || kv[0] == "" || kv[1] = "" { ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, yep, will fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. PTAL

@dcbw dcbw merged commit b69e640 into containernetworking:master Jul 12, 2017
@feiskyer feiskyer deleted the cnitool branch July 12, 2017 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants