diff options
| author | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-02-18 10:29:49 -0800 |
|---|---|---|
| committer | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-02-18 10:29:49 -0800 |
| commit | 473b87150d9757b75b1825b462740eed0d442e33 (patch) | |
| tree | 015e77cf5e3d449b028a4d6b0076b0dd452ad59e /node-allocatable.md | |
| parent | 71b65d246a42597cb73bcb24d35b0ce938aeefae (diff) | |
| parent | 04d68e03c914a3d354b3cf5f6e948b22d1685957 (diff) | |
Merge pull request #21177 from laushinka/spelling-fixes
Auto commit by PR queue bot
Diffstat (limited to 'node-allocatable.md')
| -rw-r--r-- | node-allocatable.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node-allocatable.md b/node-allocatable.md index a3520a41..ec768f8c 100644 --- a/node-allocatable.md +++ b/node-allocatable.md @@ -129,8 +129,8 @@ behavior is equivalent to the 1.1 behavior with scheduling based on Capacity. In the initial implementation, `SystemReserved` will be functionally equivalent to [`KubeReserved`](#system-reserved), but with a different semantic meaning. While KubeReserved -designates resources set asside for kubernetes components, SystemReserved designates resources set -asside for non-kubernetes components (currently this is reported as all the processes lumped +designates resources set aside for kubernetes components, SystemReserved designates resources set +aside for non-kubernetes components (currently this is reported as all the processes lumped together in the `/system` raw container). ## Issues @@ -159,7 +159,7 @@ according to `KubeReserved`. **API server expects `Allocatable` but does not receive it:** If the kubelet is older and does not provide `Allocatable` in the `NodeStatus`, then `Allocatable` will be [defaulted](../../pkg/api/v1/defaults.go) to - `Capacity` (which will yield todays behavior of scheduling based on capacity). + `Capacity` (which will yield today's behavior of scheduling based on capacity). ### 3rd party schedulers |