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

swagger: update some defines #2754

Merged
merged 1 commit into from
Mar 18, 2019
Merged

swagger: update some defines #2754

merged 1 commit into from
Mar 18, 2019

Conversation

Ace-Tang
Copy link
Contributor

update some memory related flags defines in swagger, and remove some flags
in cli which is not support on upstream kernel.

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

Ⅰ. Describe what this PR did

Ⅱ. 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

@Ace-Tang Ace-Tang requested a review from rudyfly March 15, 2019 09:40
@codecov
Copy link

codecov bot commented Mar 15, 2019

Codecov Report

Merging #2754 into master will increase coverage by 1.28%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2754      +/-   ##
=========================================
+ Coverage   68.12%   69.4%   +1.28%     
=========================================
  Files         277     277              
  Lines       17412   17412              
=========================================
+ Hits        11862   12085     +223     
+ Misses       4199    4005     -194     
+ Partials     1351    1322      -29
Flag Coverage Δ
#criv1alpha2_test 39.42% <ø> (+0.15%) ⬆️
#integration_test_0 36.56% <ø> (-0.03%) ⬇️
#integration_test_1 35.81% <ø> (ø) ⬆️
#integration_test_2 36.47% <ø> (-0.12%) ⬇️
#integration_test_3 35.45% <ø> (ø) ⬆️
#node_e2e_test 35.26% <ø> (?)
#unittest 28.51% <ø> (ø) ⬆️
Impacted Files Coverage Δ
pkg/meta/store.go 67.44% <0%> (-1.56%) ⬇️
daemon/mgr/container_utils.go 81.81% <0%> (-1.14%) ⬇️
ctrd/image.go 69.96% <0%> (+0.76%) ⬆️
daemon/mgr/container.go 60.75% <0%> (+1.25%) ⬆️
daemon/mgr/spec_linux.go 78.77% <0%> (+1.43%) ⬆️
cri/v1alpha2/cri_utils.go 87.81% <0%> (+1.85%) ⬆️
cri/stream/remotecommand/httpstream.go 46.63% <0%> (+2.59%) ⬆️
ctrd/watch.go 83.09% <0%> (+2.81%) ⬆️
daemon/logger/jsonfile/encode.go 81.52% <0%> (+3.26%) ⬆️
daemon/mgr/container_stats.go 71.83% <0%> (+3.44%) ⬆️
... and 8 more

@rudyfly
Copy link
Collaborator

rudyfly commented Mar 15, 2019

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Mar 15, 2019
update some memory related flags defines in swagger, and remove some flags
in cli which is not support on upstream kernel.

Signed-off-by: Ace-Tang <aceapril@126.com>
@allencloud
Copy link
Collaborator

You mean that we still need to support these parameters in API and daemon side, but not support them in CLI side?

I thought you would all about these parameter everywhere they appear, when last time you talked about it with me. @Ace-Tang

@rudyfly rudyfly merged commit a07f1ba into AliyunContainerService:master Mar 18, 2019
@Ace-Tang Ace-Tang deleted the update_swagger branch March 18, 2019 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
LGTM one maintainer or community participant agrees to merge the pull reuqest. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants