From c304fa1f06eb23bcdc66b3f110f496681bc80301 Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Fri, 9 Sep 2016 11:17:31 +0200
Subject: [PATCH] Remove explicit limits from manifest files

---
 .../salt/cluster-autoscaler/cluster-autoscaler.manifest     | 5 +----
 cluster/saltbase/salt/l7-gcp/glbc.manifest                  | 6 ++----
 cluster/saltbase/salt/rescheduler/rescheduler.manifest      | 4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest b/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
index d9f9f89db2f..56dfdec44d0 100644
--- a/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
+++ b/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
@@ -31,11 +31,8 @@
                     "-c",
                     "./cluster-autoscaler --kubernetes=http://127.0.0.1:8080?inClusterConfig=f --v=4 {{params}} 1>>/var/log/cluster-autoscaler.log 2>&1"
                 ],
+                # TODO: Make resource requirements depend on the size of the cluster
                 "resources": {
-                    "limits": {
-                        "cpu": "100m",
-                        "memory": "300Mi"
-                    },
                     "requests": {
                         "cpu": "20m",
                         "memory": "300Mi"
diff --git a/cluster/saltbase/salt/l7-gcp/glbc.manifest b/cluster/saltbase/salt/l7-gcp/glbc.manifest
index d227a93a9fd..9361d8f14a5 100644
--- a/cluster/saltbase/salt/l7-gcp/glbc.manifest
+++ b/cluster/saltbase/salt/l7-gcp/glbc.manifest
@@ -33,11 +33,9 @@ spec:
       name: logfile
       readOnly: false
     resources:
-      # Request and limits are set to accomodate this pod alongside the other
+      # Request is set to accomodate this pod alongside the other
       # master components on a single core master.
-      limits:
-        cpu: 100m
-        memory: 100Mi
+      # TODO: Make resource requirements depend on the size of the cluster
       requests:
         cpu: 10m
         memory: 50Mi
diff --git a/cluster/saltbase/salt/rescheduler/rescheduler.manifest b/cluster/saltbase/salt/rescheduler/rescheduler.manifest
index 8a152921620..0f26d9e8292 100644
--- a/cluster/saltbase/salt/rescheduler/rescheduler.manifest
+++ b/cluster/saltbase/salt/rescheduler/rescheduler.manifest
@@ -17,10 +17,8 @@ spec:
     - mountPath: /var/log/rescheduler.log
       name: logfile
       readOnly: false
+    # TODO: Make resource requirements depend on the size of the cluster
     resources:
-      limits:
-        cpu: 100m
-        memory: 300Mi
       requests:
         cpu: 10m
         memory: 100Mi