Skip to content

Commit

Permalink
Merge pull request kubernetes#16531 from janetkuo/remove-red-rectangles
Browse files Browse the repository at this point in the history
Remove red rectangles in quoted region in gh-pages
  • Loading branch information
bgrant0607 committed Oct 29, 2015
2 parents 92572d9 + 8f1b4c2 commit 87a95da
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions docs/user-guide/compute-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ spec:
- name: db
image: mysql
resources:
requests:
memory: "64Mi"
cpu: "250m"
requests:
memory: "64Mi"
cpu: "250m"
limits:
memory: "128Mi"
cpu: "500m"
- name: wp
image: wordpress
resources:
requests:
memory: "64Mi"
cpu: "250m"
limits:
memory: "64Mi"
cpu: "250m"
limits:
memory: "128Mi"
cpu: "500m"
```
Expand Down
10 changes: 5 additions & 5 deletions docs/user-guide/production-pods.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,11 @@ spec:
cpu: 500m
# memory units are bytes
memory: 64Mi
requests:
# cpu units are cores
cpu: 500m
# memory units are bytes
memory: 64Mi
requests:
# cpu units are cores
cpu: 500m
# memory units are bytes
memory: 64Mi
```

The container will die due to OOM (out of memory) if it exceeds its specified limit, so specifying a value a little higher than expected generally improves reliability. By specifying request, pod is guaranteed to be able to use that much of resource when needed. See [Resource QoS](../proposals/resource-qos.md) for the difference between resource limits and requests.
Expand Down

0 comments on commit 87a95da

Please sign in to comment.