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

multisnapshotter: set snapshotter in container config #2739

Merged
merged 1 commit into from Mar 10, 2019
Merged

multisnapshotter: set snapshotter in container config #2739

merged 1 commit into from Mar 10, 2019

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented Mar 9, 2019

since we support multi snapshotter, set current snapshotter in container
config, then plugin can know current used snapshotter.

Signed-off-by: Ace-Tang aceapril@126.com

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Mar 9, 2019

Codecov Report

Merging #2739 into master will decrease coverage by 0.08%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2739      +/-   ##
==========================================
- Coverage   69.42%   69.33%   -0.09%     
==========================================
  Files         278      278              
  Lines       17443    17447       +4     
==========================================
- Hits        12109    12097      -12     
- Misses       4014     4024      +10     
- Partials     1320     1326       +6
Flag Coverage Δ
#criv1alpha2_test 39.5% <100%> (+0.08%) ⬆️
#integration_test_0 36.62% <100%> (+0.03%) ⬆️
#integration_test_1 35.52% <100%> (ø) ⬆️
#integration_test_2 36.55% <100%> (-0.01%) ⬇️
#integration_test_3 35.38% <100%> (+0.02%) ⬆️
#node_e2e_test 35.31% <100%> (-0.12%) ⬇️
#unittest 28.43% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
daemon/mgr/container.go 61.16% <100%> (+0.37%) ⬆️
cri/ocicni/cni_manager.go 58.82% <0%> (-11.77%) ⬇️
daemon/logger/jsonfile/utils.go 71.54% <0%> (-1.63%) ⬇️
daemon/mgr/spec_linux.go 78.77% <0%> (-1.08%) ⬇️
ctrd/container.go 56.89% <0%> (-0.77%) ⬇️
cri/v1alpha2/cri.go 71.75% <0%> (-0.39%) ⬇️

since we support multi snapshotter, set current snapshotter in container
config, then plugin can know current used snapshotter.

Signed-off-by: Ace-Tang <aceapril@126.com>
Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM. Wait for UI.

@fuweid fuweid merged commit 7e2e266 into AliyunContainerService:master Mar 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants