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: cri support update container runtime spec annotations #2734

Conversation

zhuangqh
Copy link
Contributor

@zhuangqh zhuangqh commented Mar 4, 2019

Ⅰ. Describe what this PR did

cri support update container runtime spec annotations.

CRI proto changes:

message UpdateContainerResourcesRequest {
   ......
    // Annotations contains arbitrary metadata for the container.
    // Note: spec_annotations is the metadata for container runtime, such as runc. Not
    // the 'annotations' for Kubernetes objects.
    map<string, string> spec_annotations = 3;
}

Ⅱ. Does this pull request fix one issue?

fixes #2730

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
@codecov
Copy link

codecov bot commented Mar 4, 2019

Codecov Report

Merging #2734 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2734      +/-   ##
==========================================
+ Coverage   69.33%   69.34%   +<.01%     
==========================================
  Files         278      278              
  Lines       17442    17443       +1     
==========================================
+ Hits        12093    12095       +2     
  Misses       4023     4023              
+ Partials     1326     1325       -1
Flag Coverage Δ
#criv1alpha2_test 39.49% <100%> (ø) ⬆️
#integration_test_0 36.6% <0%> (-0.01%) ⬇️
#integration_test_1 35.49% <0%> (ø) ⬆️
#integration_test_2 36.53% <0%> (-0.08%) ⬇️
#integration_test_3 35.42% <0%> (+0.15%) ⬆️
#node_e2e_test 35.25% <0%> (-0.11%) ⬇️
#unittest 28.44% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
cri/v1alpha2/cri.go 71.75% <100%> (+0.16%) ⬆️
cri/ocicni/cni_manager.go 58.82% <0%> (-11.77%) ⬇️
ctrd/container.go 56.89% <0%> (-0.77%) ⬇️
pkg/meta/store.go 68.99% <0%> (+1.55%) ⬆️
ctrd/client.go 65.73% <0%> (+1.68%) ⬆️
daemon/mgr/container_utils.go 83.52% <0%> (+1.7%) ⬆️
daemon/mgr/events.go 91.78% <0%> (+2.73%) ⬆️

@wangforthinker
Copy link
Contributor

LGTM

@zhuangqh
Copy link
Contributor Author

zhuangqh commented Mar 6, 2019

@rudyfly cc. ready to merge

@HusterWan
Copy link
Contributor

lgtm

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Mar 8, 2019
@HusterWan HusterWan merged commit f474bca into AliyunContainerService:master Mar 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Proposal] CRI support to update annotations.
4 participants