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

cri/pkg: use our own interceptor grpc chain function #2719

Merged
merged 1 commit into from
Feb 25, 2019
Merged

cri/pkg: use our own interceptor grpc chain function #2719

merged 1 commit into from
Feb 25, 2019

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Feb 21, 2019

Signed-off-by: Wei Fu fuweid89@gmail.com

Ⅰ. Describe what this PR did

The grpc middleware uses difference protobuf version from
containerd@v1.2. In order to align with containerd, we should use our
own interceptor grpc chain function.

Ⅱ. Does this pull request fix one issue?

no

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

already add it.

Ⅳ. Describe how to verify it

CI

Ⅴ. Special notes for reviews

@fuweid fuweid requested a review from zhuangqh February 21, 2019 05:09
@codecov
Copy link

codecov bot commented Feb 21, 2019

Codecov Report

Merging #2719 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2719      +/-   ##
==========================================
- Coverage   69.26%   69.25%   -0.01%     
==========================================
  Files         278      279       +1     
  Lines       17486    17497      +11     
==========================================
+ Hits        12111    12117       +6     
- Misses       4035     4040       +5     
  Partials     1340     1340
Flag Coverage Δ
#criv1alpha2_test 39.64% <100%> (+0.1%) ⬆️
#integration_test_0 36.3% <0%> (-0.07%) ⬇️
#integration_test_1 35.21% <0%> (-0.04%) ⬇️
#integration_test_2 36.56% <0%> (-0.11%) ⬇️
#integration_test_3 35.09% <0%> (+0.08%) ⬆️
#node_e2e_test 35.08% <100%> (-0.04%) ⬇️
#unittest 27.32% <75%> (-0.03%) ⬇️
Impacted Files Coverage Δ
cri/v1alpha2/service.go 93.1% <100%> (ø) ⬆️
pkg/grpc/interceptor/chain.go 100% <100%> (ø)
apis/server/utils.go 71.15% <0%> (-3.85%) ⬇️
daemon/mgr/spec_linux.go 78.92% <0%> (-1.08%) ⬇️
cri/v1alpha2/cri.go 71.92% <0%> (-0.26%) ⬇️
daemon/mgr/container.go 59.01% <0%> (-0.21%) ⬇️
ctrd/container.go 57.27% <0%> (+0.38%) ⬆️
pkg/streams/utils.go 91.66% <0%> (+2.38%) ⬆️

@fuweid fuweid changed the title cri/pkg: use own interceptor grpc chain calls cri/pkg: use our own interceptor grpc chain calls Feb 21, 2019
@fuweid fuweid changed the title cri/pkg: use our own interceptor grpc chain calls cri/pkg: use our own interceptor grpc chain function Feb 21, 2019
The grpc middleware uses difference protobuf version from
containerd@v1.2. In order to align with containerd, we should use our
own interceptor grpc chain function.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
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 Besides, we can also rollback the update of protobuf vendor in this PR.

@zhuangqh zhuangqh merged commit 465c1c6 into AliyunContainerService:master Feb 25, 2019
@fuweid fuweid deleted the upstream-me-remove-middleware-code branch February 25, 2019 04:15
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.

3 participants