From e0186c3bd0b961b9370eec0febb49befef463599 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Tue, 23 Jun 2015 14:28:51 -0700
Subject: [PATCH] Set resource limit for both heapster and influxdb container
 based on data collected by #5880

---
 .../addons/cluster-monitoring/google/heapster-controller.yaml | 4 ++++
 .../googleinfluxdb/heapster-controller-combined.yaml          | 4 ++++
 .../cluster-monitoring/influxdb/heapster-controller.yaml      | 4 ++++
 .../influxdb/influxdb-grafana-controller.yaml                 | 4 ++++
 .../cluster-monitoring/standalone/heapster-controller.yaml    | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 1d4f3228df0..db7624b50cc 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -22,6 +22,10 @@ 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
index e476f9eecac..43882f38c4b 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -22,6 +22,10 @@ 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
index 766702a4227..2e3d33163a6 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -22,6 +22,10 @@ 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
index 94d3dc06b2b..ceef957ef35 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -22,6 +22,10 @@ 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
index e97ada1ea61..b73aeeedda3 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -22,6 +22,10 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster:v0.14.3
           name: heapster
+          resources:
+            limits:
+              cpu: 200m
+              memory: 2.5Gi
           command:
             - /heapster
             - --source=kubernetes:''