github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16531 from janetkuo/remove-red-rectangles

Browse Source 
Remove red rectangles in quoted region in gh-pages
This commit is contained in:
Brian Grant 2015-10-29 14:47:24 -07:00
commit 87a95dac1e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/user-guide/compute-resources.md
View File

@ -96,9 +96,9 @@ spec:
- name: db - name: db
image: mysql image: mysql
resources: resources:
requests: requests:
memory: "64Mi" memory: "64Mi"
cpu: "250m" cpu: "250m"
limits: limits:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
@ -106,9 +106,9 @@ spec:
image: wordpress image: wordpress
resources: resources:
requests: requests:
memory: "64Mi" memory: "64Mi"
cpu: "250m" cpu: "250m"
limits: limits:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
``` ```

10
docs/user-guide/production-pods.md
View File

@ -272,11 +272,11 @@ spec:
cpu: 500m cpu: 500m
# memory units are bytes # memory units are bytes
memory: 64Mi memory: 64Mi
requests: requests:
# cpu units are cores # cpu units are cores
cpu: 500m cpu: 500m
# memory units are bytes # memory units are bytes
memory: 64Mi 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. 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.