diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest index 09fdb9aeee3..55520c994e6 100644 --- a/cluster/saltbase/salt/etcd/etcd.manifest +++ b/cluster/saltbase/salt/etcd/etcd.manifest @@ -13,10 +13,7 @@ "image": "gcr.io/google_containers/etcd:2.0.12", "resources": { "limits": { - "cpu": "200m" - }, - "requests": { - "cpu": "100m" + "cpu": {{ cpulimit }} } }, "command": [ diff --git a/cluster/saltbase/salt/etcd/init.sls b/cluster/saltbase/salt/etcd/init.sls index 570b3022cf5..edd9f652f4b 100644 --- a/cluster/saltbase/salt/etcd/init.sls +++ b/cluster/saltbase/salt/etcd/init.sls @@ -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: @@ -79,3 +80,4 @@ touch /var/log/etcd-events.log: suffix: "-events" port: 4002 server_port: 2381 + cpulimit: '"100m"' diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest index ddc013d85d5..1202be4269a 100644 --- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest +++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest @@ -112,7 +112,7 @@ "image": "gcr.io/google_containers/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}", "resources": { "limits": { - "cpu": "200m" + "cpu": "250m" } }, "command": [ diff --git a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest index 73728c09749..259b45540c5 100644 --- a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest +++ b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest @@ -24,7 +24,7 @@ "image": "gcr.io/google_containers/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}", "resources": { "limits": { - "cpu": "200m" + "cpu": "100m" } }, "command": [