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

Support setting max network config file to load. #30

Merged
merged 1 commit into from
Aug 29, 2018

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Aug 28, 2018

For containerd/cri#889

For Kubernetes, only one default pod network is needed. This PR:

  1. Changed WithDefaultConf to only load the default config.
  2. Added WithAllConf to load all configurations.

We can continue using WithDefaultConf for Kubernetes, and for people who need multiple network support, they can use WithAllConf.
@abhi @crosbymichael

Signed-off-by: Lantao Liu lantaol@google.com

@codecov-io
Copy link

codecov-io commented Aug 28, 2018

Codecov Report

Merging #30 into master will increase coverage by 0.22%.
The diff coverage is 54.54%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #30      +/-   ##
==========================================
+ Coverage   41.41%   41.63%   +0.22%     
==========================================
  Files           8        8              
  Lines         297      305       +8     
==========================================
+ Hits          123      127       +4     
- Misses        145      148       +3     
- Partials       29       30       +1
Impacted Files Coverage Δ
opts.go 18.42% <54.54%> (+2.38%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ef9a3f8...6d7b509. Read the comment docs.

Signed-off-by: Lantao Liu <lantaol@google.com>
@crosbymichael
Copy link
Member

LGTM

@abhi abhi merged commit 7585e6d into containerd:master Aug 29, 2018
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.

4 participants