Update CNI to v0.6.0 and add port mapping support. #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mrunalp Do you prefer we maintain this in our repo or get this merged here? :) |
|
@Random-Liu This looks fine to me 👍 :) |
rajatchopra
approved these changes
Aug 23, 2017
ocicni.go
Outdated
| // Search for vendor-specific plugins as well as default plugins in the CNI codebase. | ||
| vendorDir := vendorCNIDir(vendorCNIDirPrefix, conf.Network.Type) | ||
| vendorDir := vendorCNIDir(vendorCNIDirPrefix, confList.Plugins[0].Network.Type) |
There was a problem hiding this comment.
We should probably log which network executable we finally picked up and from which file. Will be helpful in debugging as we now have multiple files and multiple plugins in same file.
Signed-off-by: Lantao Liu <lantaol@google.com>
Random-Liu
force-pushed
the
support-port-mapping
branch
from
3bb4225
to
0993d98
Compare
|
LGTM |
|
@mrunalp Thanks! I'll update the dependency in cri-containerd. Actually cri-o could also use this to get rid of the annoying hostport package. :p |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
@mrunalp
Signed-off-by: Lantao Liu lantaol@google.com