From 54933902b23cb9a5cc322c17f6c266a41470bb61 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Fri, 12 Feb 2016 14:28:48 -0800
Subject: [PATCH] Make master component pods burstable, instead of guaranteed.

---
 cluster/saltbase/salt/etcd/etcd.manifest                        | 2 +-
 cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest    | 2 +-
 .../kube-controller-manager/kube-controller-manager.manifest    | 2 +-
 cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest
index 33c04dab039..4bf4851a1b7 100644
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -12,7 +12,7 @@
     "name": "etcd-container",
     "image": "gcr.io/google_containers/etcd:2.2.1",
     "resources": {
-      "limits": {
+      "requests": {
         "cpu": {{ cpulimit }}
       }
     },
diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
index 2120ff23887..0b385e29b3e 100644
--- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
+++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
@@ -117,7 +117,7 @@
     "name": "kube-apiserver",
     "image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
     "resources": {
-      "limits": {
+      "requests": {
         "cpu": "250m"
       }
     },
diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
index 39444e91005..5777ef0ee30 100644
--- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
+++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
@@ -74,7 +74,7 @@
     "name": "kube-controller-manager",
     "image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
     "resources": {
-      "limits": {
+      "requests": {
         "cpu": "200m"
       }
     },
diff --git a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
index 8da3d72c3ff..7ae312a3d6f 100644
--- a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
+++ b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
@@ -26,7 +26,7 @@
     "name": "kube-scheduler",
     "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
     "resources": {
-      "limits": {
+      "requests": {
         "cpu": "100m"
       }
     },