Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak limits for system pods in manifest files. #15068

Merged
merged 1 commit into from
Oct 7, 2015
+5 −6
Merged

Tweak limits for system pods in manifest files. #15068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions cluster/saltbase/salt/etcd/etcd.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
"image": "gcr.io/google_containers/etcd:2.0.12",
"resources": {
"limits": {
"cpu": "200m"
},
"requests": {
"cpu": "100m"
"cpu": {{ cpulimit }}
}
},
"command": [
Expand Down
2 changes: 2 additions & 0 deletions cluster/saltbase/salt/etcd/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ touch /var/log/etcd-events.log:
suffix: ""
port: 4001
server_port: 2380
cpulimit: '"200m"'

/etc/kubernetes/manifests/etcd-events.manifest:
file.managed:
Expand All @@ -79,3 +80,4 @@ touch /var/log/etcd-events.log:
suffix: "-events"
port: 4002
server_port: 2381
cpulimit: '"100m"'
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"image": "gcr.io/google_containers/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"resources": {
"limits": {
"cpu": "200m"
"cpu": "250m"
}
},
"command": [
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"image": "gcr.io/google_containers/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"limits": {
"cpu": "200m"
"cpu": "100m"
}
},
"command": [
Expand Down