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

feature: support multiple containerd-shim #2363

Closed
wants to merge 1 commit into from
Closed

feature: support multiple containerd-shim #2363

wants to merge 1 commit into from

Conversation

Ace-Tang
Copy link
Contributor

different runtime can have a specified containerd-shim, especially for
vm runtime like kata/runv.

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

Ⅰ. Describe what this PR did

what the pr want to do

First we see how pouch run a container, pouch -> containerd -> containerd-shim -> runtime. The PR specify the shim can be choosed for the runtime, this is useful for vm runtime like kata/runv, since vm containers have many different with runc container cause they running in a vm machine.

containerd 1.2 have support a shim v2 API(containerd/containerd#2434), this allowed a runtime to specify itself shim, they can do more custom then.

what the PR status

The PR is compele finished in function, we pass a shim interface to containerd to choose the shim, this is supported by containerd 1.0.3, so it can be merged now, no need to wait for containerd 1.2. And all process in create container in pouch is keeping same.

TODO list

  1. kata implement about containerd-shim-v2 is waiting for merged (Implement containerd shim v2 API for Kata Containers kata-containers/runtime#572), I have testd it with containerd 1.2, it works good. Kata test may not easy to add in pouch , but we can add some v2 test after we support containerd 1.2.

Ⅱ. 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 Oct 26, 2018

Codecov Report

Merging #2363 into master will decrease coverage by 4.22%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2363      +/-   ##
==========================================
- Coverage    69.2%   64.98%   -4.23%     
==========================================
  Files         277      277              
  Lines       18330    18333       +3     
==========================================
- Hits        12685    11913     -772     
- Misses       4206     5127     +921     
+ Partials     1439     1293     -146
Flag Coverage Δ
#criv1alpha1test 12.26% <ø> (-19.17%) ⬇️
#criv1alpha2test 35.53% <100%> (-0.08%) ⬇️
#integrationtest 40.77% <100%> (ø) ⬆️
#nodee2etest 32.96% <100%> (-0.02%) ⬇️
#unittest 26.69% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
daemon/mgr/container_types.go 83.33% <ø> (ø) ⬆️
ctrd/container.go 59.28% <100%> (ø) ⬆️
daemon/mgr/container.go 59.13% <100%> (+0.77%) ⬆️
cri/v1alpha1/cri_types.go 0% <0%> (-100%) ⬇️
cri/v1alpha1/service/cri.go 0% <0%> (-84.62%) ⬇️
cri/v1alpha1/server.go 0% <0%> (-79.2%) ⬇️
cri/v1alpha1/cri.go 0% <0%> (-60.27%) ⬇️
cri/v1alpha1/cri_wrapper.go 0% <0%> (-55.31%) ⬇️
cri/v1alpha1/cri_stream.go 28.57% <0%> (-37.15%) ⬇️
cri/v1alpha1/cri_utils.go 60.37% <0%> (-23.16%) ⬇️
... and 6 more

@pouchrobot
Copy link
Collaborator

ping @Ace-Tang
Conflict happens after merging a previous commit.
Please rebase the branch against master and push it back again. Thanks a lot.

@Ace-Tang Ace-Tang closed this May 8, 2019
@Ace-Tang Ace-Tang deleted the containerd_v2_shim branch May 8, 2019 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants