Skip to content

Conversation

@fuweid
Copy link
Contributor

@fuweid fuweid commented Mar 21, 2019

Signed-off-by: Wei Fu [email protected]

Ⅰ. Describe what this PR did

time to remove v1alpha1 cri

Ⅱ. Does this pull request fix one issue?

fix #2689

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

none

Ⅳ. Describe how to verify it

CI

Ⅴ. Special notes for reviews

@codecov
Copy link

codecov bot commented Mar 21, 2019

Codecov Report

Merging #2765 into master will increase coverage by 0.1%.
The diff coverage is 0%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #2765     +/-   ##
========================================
+ Coverage   69.39%   69.5%   +0.1%     
========================================
  Files         277     277             
  Lines       17435   17401     -34     
========================================
- Hits        12099   12094      -5     
+ Misses       4008    3977     -31     
- Partials     1328    1330      +2
Flag Coverage Δ
#criv1alpha2_test 39.46% <0%> (+0.11%) ⬆️
#integration_test_0 36.71% <0%> (+0.07%) ⬆️
#integration_test_1 35.54% <0%> (+0.11%) ⬆️
#integration_test_2 36.54% <0%> (+0.12%) ⬆️
#integration_test_3 35.63% <0%> (+0.08%) ⬆️
#node_e2e_test 35.24% <0%> (ø) ⬆️
#unittest 28.53% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cri/criservice.go 59.18% <0%> (+24.24%) ⬆️
cri/ocicni/cni_manager.go 58.82% <0%> (-11.77%) ⬇️
daemon/mgr/container.go 60.41% <0%> (-0.42%) ⬇️
cri/v1alpha2/cri.go 71.09% <0%> (-0.39%) ⬇️
ctrd/container.go 56.21% <0%> (+0.38%) ⬆️
pkg/streams/utils.go 91.66% <0%> (+2.38%) ⬆️
ctrd/watch.go 83.09% <0%> (+5.63%) ⬆️

@zhuangqh
Copy link
Contributor

zhuangqh commented Apr 2, 2019

please also remove cri alphav1 related code here
@fuweid https://github.com/alibaba/pouch/blob/master/travis_ci.sh#L63

@allencloud
Copy link
Collaborator

Could we kick the ball? @fuweid @zhuangqh

@fuweid
Copy link
Contributor Author

fuweid commented Apr 2, 2019

@allencloud @zhuangqh

sorry for the late reply. please take a look. If it is good to go, we can move it on.

@allencloud
Copy link
Collaborator

I would like to invite @zhuangqh to review and merge if reasonable.

Copy link
Contributor

@zhuangqh zhuangqh left a comment

Choose a reason for hiding this comment

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

LGTM

@zhuangqh zhuangqh merged commit ae4a64f into AliyunContainerService:master Apr 3, 2019
@fuweid fuweid deleted the me-remove-cri1 branch June 4, 2019 13:33
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.

[RFC] move CRI v1alpha1 support to END OF LIFE

4 participants