From 4f2d22263ed8204b54b88c7a540f2cf4e3ac965b Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Wed, 1 Jul 2015 14:39:10 -0700
Subject: [PATCH] Set resource limit for both heapster and influxdb container
 based on data collected by #10335. Please noted that both influxdb and
 heapster could be oom-killed due to memory leakage here.

---
 .../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             | 8 ++++++++
 .../standalone/heapster-controller.yaml                   | 4 ++++
 5 files changed, 24 insertions(+)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 42a55530026..78c2d1a1769 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.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           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 b05eb098b5d..a283f2eb0d2 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.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           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 348db83b9ac..030c34dccc3 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.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           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..1f7cbcd79cc 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: 100m
+              memory: 200Mi
           ports: 
             - containerPort: 8083
               hostPort: 8083
@@ -29,6 +33,10 @@ spec:
               hostPort: 8086
         - image: gcr.io/google_containers/heapster_grafana:v0.7
           name: grafana
+          resources:
+            limits:
+              cpu: 100m
+              memory: 100Mi
           env: 
             - name: INFLUXDB_EXTERNAL_URL
               value: /api/v1beta3/proxy/namespaces/default/services/monitoring-influxdb:api/db/
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 130ee8827e2..ee765b1091c 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.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           command:
             - /heapster
             - --source=kubernetes:''