Revert "Set resource limit for both heapster and influxdb container b…

…ased on" (cherry picked from commit 1a4d3ef)
sshen · Jun 29, 2015 · c464aaa · c464aaa
1 parent 3223a8e
commit c464aaa
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 20 deletions.
diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -22,10 +22,6 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster:v0.14.3
           name: heapster
-          resources:
-            limits:
-              cpu: 200m
-              memory: 2.5Gi
           command:
             - /heapster
             - --source=kubernetes:''

diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -22,10 +22,6 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster:v0.14.3
           name: heapster
-          resources:
-            limits:
-              cpu: 200m
-              memory: 2.5Gi
           command:
             - /heapster
             - --source=kubernetes:''

diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -22,10 +22,6 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster:v0.14.3
           name: heapster
-          resources:
-            limits:
-              cpu: 200m
-              memory: 2.5Gi
           command:
             - /heapster
             - --source=kubernetes:''

diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -22,10 +22,6 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster_influxdb:v0.3
           name: influxdb
-          resources:
-            limits:
-              cpu: 300m
-              memory: 2Gi
           ports: 
             - containerPort: 8083
               hostPort: 8083

diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -22,10 +22,6 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster:v0.14.3
           name: heapster
-          resources:
-            limits:
-              cpu: 200m
-              memory: 2.5Gi
           command:
             - /heapster
             - --source=kubernetes:''