github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15068 from wojtek-t/fix_default_limits

Browse Source 
Tweak limits for system pods in manifest files.
This commit is contained in:
Filip Grzadkowski 2015-10-07 09:41:28 +02:00
commit c1345ce2d9
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/saltbase/salt/etcd/etcd.manifest
View File

@ -13,10 +13,7 @@
"image": "gcr.io/google_containers/etcd:2.0.12", "image": "gcr.io/google_containers/etcd:2.0.12",
"resources": { "resources": {
"limits": { "limits": {
"cpu": "200m" "cpu": {{ cpulimit }}
},
"requests": {
"cpu": "100m"
} }
}, },
"command": [ "command": [

2
cluster/saltbase/salt/etcd/init.sls
View File

@ -65,6 +65,7 @@ touch /var/log/etcd-events.log:
suffix: "" suffix: ""
port: 4001 port: 4001
server_port: 2380 server_port: 2380
cpulimit: '"200m"'
/etc/kubernetes/manifests/etcd-events.manifest: /etc/kubernetes/manifests/etcd-events.manifest:
file.managed: file.managed:
@ -79,3 +80,4 @@ touch /var/log/etcd-events.log:
suffix: "-events" suffix: "-events"
port: 4002 port: 4002
server_port: 2381 server_port: 2381
cpulimit: '"100m"'

2
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@ -112,7 +112,7 @@
"image": "gcr.io/google_containers/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}", "image": "gcr.io/google_containers/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"resources": { "resources": {
"limits": { "limits": {
"cpu": "200m" "cpu": "250m"
} }
}, },
"command": [ "command": [

2
cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
View File

@ -24,7 +24,7 @@
"image": "gcr.io/google_containers/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}", "image": "gcr.io/google_containers/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": { "resources": {
"limits": { "limits": {
"cpu": "200m" "cpu": "100m"
} }
}, },
"command": [ "command": [