Skip to content

Conversation

@wangforthinker
Copy link
Contributor

Ⅰ. Describe what this PR did

flagset.StringSlice will split args by comma so that the annotation parse job fails. Should use StringArray for env/labels.

Ⅱ. Does this pull request fix one issue?

NONE.

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

add test.

Ⅳ. Describe how to verify it

add test.

Ⅴ. Special notes for reviews

related to #2171.

@codecov
Copy link

codecov bot commented Jan 29, 2019

Codecov Report

Merging #2702 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2702      +/-   ##
==========================================
+ Coverage    69.2%   69.21%   +<.01%     
==========================================
  Files         278      278              
  Lines       17449    17449              
==========================================
+ Hits        12076    12077       +1     
+ Misses       4045     4040       -5     
- Partials     1328     1332       +4
Flag Coverage Δ
#criv1alpha2_test 39.52% <ø> (+0.28%) ⬆️
#integration_test_0 36.3% <ø> (+0.02%) ⬆️
#integration_test_1 35.23% <ø> (+0.03%) ⬆️
#integration_test_2 36.37% <ø> (+0.04%) ⬆️
#integration_test_3 35.14% <ø> (+0.08%) ⬆️
#node_e2e_test 34.95% <ø> (-0.07%) ⬇️
#unittest 27.39% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cri/ocicni/cni_manager.go 58.82% <0%> (-11.77%) ⬇️
pkg/streams/utils.go 82.14% <0%> (-9.53%) ⬇️
ctrd/container.go 56.89% <0%> (-0.77%) ⬇️
cri/v1alpha2/cri.go 71.28% <0%> (-0.39%) ⬇️
daemon/mgr/container_utils.go 85.11% <0%> (+1.19%) ⬆️
pkg/meta/store.go 68.99% <0%> (+1.55%) ⬆️
cri/v1alpha2/container_unpause.go 81.81% <0%> (+81.81%) ⬆️
cri/v1alpha2/container_pause.go 81.81% <0%> (+81.81%) ⬆️

@wangforthinker wangforthinker force-pushed the fix/cli-annotation-flagSet branch from 56694f2 to 0fd86a6 Compare January 29, 2019 12:57
@wangforthinker wangforthinker force-pushed the fix/cli-annotation-flagSet branch from 0fd86a6 to 17b32e6 Compare January 29, 2019 12:59
@wangforthinker wangforthinker requested a review from fuweid January 29, 2019 13:00
@wangforthinker
Copy link
Contributor Author

ping @fuweid

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

@fuweid fuweid merged commit 1490a08 into AliyunContainerService:master Jan 29, 2019
@wangforthinker wangforthinker deleted the fix/cli-annotation-flagSet branch January 30, 2019 03:25
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