From 9c722ba98e001afc91a18e5fcbcb1a645119022b Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Mon, 15 Feb 2016 12:43:03 +0100
Subject: [PATCH] Update memory requirements for new Heapster

---
 .../addons/cluster-monitoring/google/heapster-controller.yaml | 4 ++--
 .../googleinfluxdb/heapster-controller-combined.yaml          | 4 ++--
 .../cluster-monitoring/influxdb/heapster-controller.yaml      | 4 ++--
 .../cluster-monitoring/standalone/heapster-controller.yaml    | 4 ++--
 cluster/gce/trusty/configure.sh                               | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index de957219bc1..df2ad694e7f 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,7 +1,7 @@
-{% set heapster_memory = "300Mi" -%}
+{% set heapster_memory = "200Mi" -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
+  {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
 {% endif -%}
 
 apiVersion: v1
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 9b5bcb0a010..80b0ffb7004 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,7 +1,7 @@
-{% set heapster_memory = "300Mi" -%}
+{% set heapster_memory = "200Mi" -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
+  {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
 {% endif -%}
 
 apiVersion: v1
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 7d6a8487b3d..139bb976126 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,7 +1,7 @@
-{% set heapster_memory = "300Mi" -%}
+{% set heapster_memory = "200Mi" -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
+  {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
 {% endif -%}
 
 apiVersion: v1
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 4032820ae22..ce68c3c1e7a 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,7 +1,7 @@
-{% set heapster_memory = "300Mi" -%}
+{% set heapster_memory = "200Mi" -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
+  {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
 {% endif -%}
 
 apiVersion: v1
diff --git a/cluster/gce/trusty/configure.sh b/cluster/gce/trusty/configure.sh
index 7d59e864aae..a8559afbd98 100644
--- a/cluster/gce/trusty/configure.sh
+++ b/cluster/gce/trusty/configure.sh
@@ -628,9 +628,9 @@ prepare_kube_addons() {
     file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
     setup_addon_manifests "addons" "${file_dir}"
     # Replace the salt configurations with variable values.
-    heapster_memory="300Mi"
+    heapster_memory="200Mi"
     if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -gt 1 ]; then
-      heapster_memory="$((${NUM_NODES} * 12 + 200))Mi"
+      heapster_memory="$((${NUM_NODES} * 3 + 200))Mi"
     fi
     controller_yaml="${addon_dst_dir}/${file_dir}"
     if [ "${ENABLE_CLUSTER_MONITORING:-}" = "googleinfluxdb" ]; then