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

ocicni: allow specifying the cniDir for CNI plugins #3

Merged
merged 1 commit into from
Jan 5, 2017
Merged

ocicni: allow specifying the cniDir for CNI plugins #3

merged 1 commit into from
Jan 5, 2017

Conversation

cyphar
Copy link
Contributor

@cyphar cyphar commented Dec 30, 2016

This is necessary in order to allow distributions to install CNI plugins
into directories other than the arbitrary ones specified in this
project.

Ref: cri-o/cri-o#295
Fixes #2
Signed-off-by: Aleksa Sarai asarai@suse.de

@rajatchopra
Copy link
Owner

How about using variadic function arguments for Init; specifying multiple places to look for?

@cyphar
Copy link
Contributor Author

cyphar commented Dec 30, 2016

You can't have more than one variadic argument, so presumably we'll have to make them both lists? Unless you're saying that only cniDir should have more than one option?

@rajatchopra
Copy link
Owner

I meant multiple for cnidir.

@cyphar
Copy link
Contributor Author

cyphar commented Dec 30, 2016

Sure, I'll implement it.

This is necessary in order to allow distributions to install CNI plugins
into directories other than the arbitrary ones specified in this
project.

Ref: cri-o/cri-o#295
Signed-off-by: Aleksa Sarai <asarai@suse.de>
Copy link
Owner

@rajatchopra rajatchopra left a comment

Choose a reason for hiding this comment

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

LGTM will test and merge. Thanks.

@sameo
Copy link

sameo commented Jan 4, 2017

FWIW:

LGTM as well.

@rajatchopra rajatchopra merged commit f3c47a2 into rajatchopra:master Jan 5, 2017
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.

3 participants