Merge pull request #21258 from gmarek/heapster

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

-{% 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

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

-{% 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

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

-{% 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

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

-{% 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

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