Merge pull request #2912 from wenlxie/master

Update manage-compute-resources-container.md
reviewable/pr2949/r1
devin-donnelly 2017-03-21 17:02:51 -07:00 committed by GitHub
commit 414e9722ae
1 changed files with 1 additions and 1 deletions

View File

@ -138,7 +138,7 @@ When using Docker:
- The `spec.containers[].resources.limits.cpu` is converted to its millicore value,
multiplied by 100000, and then divided by 1000. This number is used as the value
of the [`--cpu-quota`](https://docs.docker.com/engine/reference/run/#/cpu-quota-constraint)
flag in the `docker run` command. he [`--cpu-period`] flag is set to 100000,
flag in the `docker run` command. The [`--cpu-period`] flag is set to 100000,
which represents the default 100ms period for measuring quota usage. The
kubelet enforces cpu limits if it is started with the
[`--cpu-cfs-quota`] flag set to true. As of Kubernetes version 1.2, this flag