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

bugfix: cpu params json name compatibility with moby #2041

Merged

Conversation

HusterWan
Copy link
Contributor

Signed-off-by: Michael Wan zirenwan@gmail.com

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/L labels Aug 2, 2018
@codecov-io
Copy link

codecov-io commented Aug 2, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2041      +/-   ##
==========================================
- Coverage   63.83%   63.82%   -0.01%     
==========================================
  Files         200      200              
  Lines       15531    15531              
==========================================
- Hits         9914     9913       -1     
- Misses       4387     4388       +1     
  Partials     1230     1230
Flag Coverage Δ
#criv1alpha1test 33.82% <ø> (ø) ⬆️
#criv1alpha2test 34.23% <ø> (-0.02%) ⬇️
#integrationtest 38.47% <ø> (-0.02%) ⬇️
#unittest 22% <ø> (ø) ⬆️
Impacted Files Coverage Δ
daemon/mgr/system.go 75.21% <0%> (-1.71%) ⬇️
cri/v1alpha2/cri.go 66.31% <0%> (-0.18%) ⬇️
ctrd/watch.go 75.75% <0%> (+3.03%) ⬆️

apis/swagger.yml Outdated
@@ -2261,7 +2261,7 @@ definitions:
Resources:
description: "A container's resources (cgroups config, ulimits, etc)"
type: "object"
required: [CPUShares, Memory, CgroupParent, BlkioWeight, CPUPeriod, CPUQuota, CpuRealtimePeriod,
required: [CpuShares, Memory, CgroupParent, BlkioWeight, CpuPeriod, CpuQuota, CpuRealtimePeriod,
CpuRealtimeRuntime, CpusetCpus, CpusetMems, DeviceCgroupRules, KernelMemory, MemoryReservation,
MemorySwap, MemorySwappiness, NanoCPUs, OomKillDisable, PidsLimit, CpuCount, CpuPercent,
Copy link
Collaborator

Choose a reason for hiding this comment

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

just double check if we need to update NanoCPUs? @HusterWan

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch!

Signed-off-by: Michael Wan <zirenwan@gmail.com>
@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Aug 2, 2018
@allencloud allencloud merged commit 90f92af into AliyunContainerService:master Aug 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project 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