github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6921 from derekwaynecarr/fix_example

Browse Source 
Docker requires a minimum amount of memory for container
This commit is contained in:
Eric Tune 2015-04-16 13:27:48 -07:00
commit cbb1108b73
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/limitrange/limit-range.json
View File

@ -11,7 +11,7 @@
"cpu": "2" "cpu": "2"
}, },
"min": { "min": {
"memory": "1048576", "memory": "5242880",
"cpu": "0.25" "cpu": "0.25"
} }
}, },
@ -22,11 +22,11 @@
"cpu": "2" "cpu": "2"
}, },
"min": { "min": {
"memory": "1048576", "memory": "5242880",
"cpu": "0.25" "cpu": "0.25"
}, },
"default": { "default": {
"memory": "1048576", "memory": "5242880",
"cpu": "0.25" "cpu": "0.25"
} }
} }

6
examples/limitrange/v1beta3/limit-range.json
View File

@ -13,7 +13,7 @@
"cpu": "2" "cpu": "2"
}, },
"min": { "min": {
"memory": "1Mi", "memory": "5Mi",
"cpu": "250m" "cpu": "250m"
} }
}, },
@ -24,11 +24,11 @@
"cpu": "2" "cpu": "2"
}, },
"min": { "min": {
"memory": "1Mi", "memory": "5Mi",
"cpu": "250m" "cpu": "250m"
}, },
"default": { "default": {
"memory": "1Mi", "memory": "5Mi",
"cpu": "250m" "cpu": "250m"
} }
} }

2
examples/limitrange/v1beta3/valid-pod.json
View File

@ -14,7 +14,7 @@
"resources": { "resources": {
"limits": { "limits": {
"cpu": "1", "cpu": "1",
"memory": "1Mi" "memory": "5Mi"
} }
} }
}] }]

2
examples/limitrange/valid-pod.json
View File

@ -13,7 +13,7 @@
"name": "kubernetes-serve-hostname", "name": "kubernetes-serve-hostname",
"image": "gcr.io/google_containers/serve_hostname", "image": "gcr.io/google_containers/serve_hostname",
"cpu": 1000, "cpu": 1000,
"memory": 1048576 "memory": 5242880
}] }]
} }
} }