summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Brown <mattbrown@spotify.com>2017-06-20 15:58:59 -0400
committerMatt Brown <mattbrown@spotify.com>2017-06-20 15:58:59 -0400
commit351d014aea85ca5edf4c644143c23f4a7ea3b3d9 (patch)
treee0828e51ba794bead95b615607c338494b1aba94
parent175211c76f4d940627d98042ad83d9cb785c70db (diff)
replace tabs in yaml snippets with spaces
Github appears to render YAML snippets with tabs used for indentation with big red blobs over the whitespace inserted by the tabs (showing that there is a syntax error, apparently). Change the indentation to two spaces so that the document displays cleaner when viewing on github.com.
-rw-r--r--contributors/design-proposals/resource-qos.md112
1 files changed, 56 insertions, 56 deletions
diff --git a/contributors/design-proposals/resource-qos.md b/contributors/design-proposals/resource-qos.md
index 55962158..13ad0bd4 100644
--- a/contributors/design-proposals/resource-qos.md
+++ b/contributors/design-proposals/resource-qos.md
@@ -57,37 +57,37 @@ Examples:
```yaml
containers:
- name: foo
- resources:
- limits:
- cpu: 10m
- memory: 1Gi
- name: bar
- resources:
- limits:
- cpu: 100m
- memory: 100Mi
+ name: foo
+ resources:
+ limits:
+ cpu: 10m
+ memory: 1Gi
+ name: bar
+ resources:
+ limits:
+ cpu: 100m
+ memory: 100Mi
```
```yaml
containers:
- name: foo
- resources:
- limits:
- cpu: 10m
- memory: 1Gi
- requests:
- cpu: 10m
- memory: 1Gi
-
- name: bar
- resources:
- limits:
- cpu: 100m
- memory: 100Mi
- requests:
- cpu: 100m
- memory: 100Mi
+ name: foo
+ resources:
+ limits:
+ cpu: 10m
+ memory: 1Gi
+ requests:
+ cpu: 10m
+ memory: 1Gi
+
+ name: bar
+ resources:
+ limits:
+ cpu: 100m
+ memory: 100Mi
+ requests:
+ cpu: 100m
+ memory: 100Mi
```
- If `requests` and optionally `limits` are set (not equal to `0`) for one or more resources across one or more containers, and they are *not equal*, then the pod is classified as **Burstable**.
@@ -99,44 +99,44 @@ Container `bar` has not resources specified.
```yaml
containers:
- name: foo
- resources:
- limits:
- cpu: 10m
- memory: 1Gi
- requests:
- cpu: 10m
- memory: 1Gi
-
- name: bar
+ name: foo
+ resources:
+ limits:
+ cpu: 10m
+ memory: 1Gi
+ requests:
+ cpu: 10m
+ memory: 1Gi
+
+ name: bar
```
Container `foo` and `bar` have limits set for different resources.
```yaml
containers:
- name: foo
- resources:
- limits:
- memory: 1Gi
-
- name: bar
- resources:
- limits:
- cpu: 100m
+ name: foo
+ resources:
+ limits:
+ memory: 1Gi
+
+ name: bar
+ resources:
+ limits:
+ cpu: 100m
```
Container `foo` has no limits set, and `bar` has neither requests nor limits specified.
```yaml
containers:
- name: foo
- resources:
- requests:
- cpu: 10m
- memory: 1Gi
+ name: foo
+ resources:
+ requests:
+ cpu: 10m
+ memory: 1Gi
- name: bar
+ name: bar
```
- If `requests` and `limits` are not set for all of the resources, across all containers, then the pod is classified as **Best-Effort**.
@@ -145,10 +145,10 @@ Examples:
```yaml
containers:
- name: foo
- resources:
- name: bar
- resources:
+ name: foo
+ resources:
+ name: bar
+ resources:
```
Pods will not be killed if CPU guarantees cannot be met (for example if system tasks or daemons take up lots of CPU), they will be temporarily throttled.