From 7d47d2dcd854bf5778678ae004798ea148600a7e Mon Sep 17 00:00:00 2001
From: Prashanth Balasubramanian <beeps@google.com>
Date: Wed, 24 Feb 2016 18:17:22 -0800
Subject: [PATCH] Kube-proxy requests 2x cpu shares of addons.

---
 cluster/saltbase/salt/kube-proxy/init.sls            | 4 +++-
 cluster/saltbase/salt/kube-proxy/kube-proxy.manifest | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls
index 868235a3cdc5..3ca22ccbef1e 100644
--- a/cluster/saltbase/salt/kube-proxy/init.sls
+++ b/cluster/saltbase/salt/kube-proxy/init.sls
@@ -16,6 +16,8 @@
     - mode: 644
     - makedirs: true
     - dir_mode: 755
+    - context:
+        cpurequest: '200m'
     - require:
       - service: docker
       - service: kubelet
@@ -26,7 +28,7 @@
     - group: root
     - mode: 644
 
-#stop legacy kube-proxy service 
+#stop legacy kube-proxy service
 stop_kube-proxy:
   service.dead:
     - name: kube-proxy
diff --git a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
index d702f7b937a7..ff462473c5c1 100644
--- a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
+++ b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
@@ -31,6 +31,9 @@ spec:
   containers:
   - name: kube-proxy
     image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
+    resources:
+      requests:
+        cpu: {{ cpurequest }}
     command:
     - /bin/sh
     - -c