Moved cpu_shares and cpuset to unsupported keys #543
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
|
LGTM other than the small comment. Perhaps it would be good (in the future) to advise users to use cpu_quota instead of cpu_share or cpu_set! Thanks for the contribution! |
cdrage
requested changes
Apr 5, 2017
pkg/kobject/kobject.go
Outdated
| @@ -67,8 +67,6 @@ type ServiceConfig struct { | |||
| Network []string `compose:"network" bundle:"Networks"` | |||
| Labels map[string]string `compose:"labels" bundle:"Labels"` | |||
| Annotations map[string]string `compose:"" bundle:""` | |||
| CPUSet string `compose:"cpuset" bundle:""` | |||
| CPUShares int64 `compose:"cpu_shares" bundle:""` | |||
There was a problem hiding this comment.
Please don't remove these, as you can see in the "unsupported keys" section in compose.go, we still grab these from the docker-compose file for (possible) future integration!
Resolves kubernetes#272 and kubernetes#267 As there is no direct mapping of `cpushares` and `cpuset` to kubernetes, it should not be read and should be moved to unsupported keys.
|
LGTM |
cdrage
approved these changes
Apr 6, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #272 and #267
As there is no direct mapping of
cpusharesandcpusetto kubernetes,it should not be read and should be moved to unsupported keys.