Skip to content

Commit

Permalink
Merge pull request kubernetes#1426 from sak0/dev
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

resource-qos: fix invalid links

fix invalid links on resource-qos.md

Signed-off-by: CuiHaozhi <[email protected]>
  • Loading branch information
Kubernetes Submit Queue authored Nov 22, 2017
2 parents dabcb65 + 50c8b1b commit 06a0697
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contributors/design-proposals/node/resource-qos.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Borg increased utilization by about 20% when it started allowing use of such non

## Requests and Limits

For each resource, containers can specify a resource request and limit, `0 <= request <= `[`Node Allocatable`](../design-proposals/node/node-allocatable.md) & `request <= limit <= Infinity`.
For each resource, containers can specify a resource request and limit, `0 <= request <= `[`Node Allocatable`](node-allocatable.md) & `request <= limit <= Infinity`.
If a pod is successfully scheduled, the container is guaranteed the amount of resources requested.
Scheduling is based on `requests` and not `limits`.
The pods and its containers will not be allowed to exceed the specified limit.
How the request and limit are enforced depends on whether the resource is [compressible or incompressible](resources.md).
How the request and limit are enforced depends on whether the resource is [compressible or incompressible](../scheduling/resources.md).

### Compressible Resource Guarantees

Expand All @@ -41,7 +41,7 @@ How the request and limit are enforced depends on whether the resource is [compr

### Admission/Scheduling Policy

- Pods will be admitted by Kubelet & scheduled by the scheduler based on the sum of requests of its containers. The scheduler & kubelet will ensure that sum of requests of all containers is within the node's [allocatable](../proposals/node-allocatable.md) capacity (for both memory and CPU).
- Pods will be admitted by Kubelet & scheduled by the scheduler based on the sum of requests of its containers. The scheduler & kubelet will ensure that sum of requests of all containers is within the node's [allocatable](node-allocatable.md) capacity (for both memory and CPU).

## QoS Classes

Expand Down

0 comments on commit 06a0697

Please sign in to comment.