From 81ee3e2d305b7289f0c8404844bdfdb6fb8d3f2e Mon Sep 17 00:00:00 2001
From: Quintin Lee <qlee@google.com>
Date: Mon, 23 May 2016 13:14:36 -0700
Subject: [PATCH] Fixing heapster memory requirements.

---
 .../cluster-monitoring/google/heapster-controller.yaml | 10 ++++++----
 .../googleinfluxdb/heapster-controller-combined.yaml   | 10 ++++++----
 .../influxdb/heapster-controller.yaml                  | 10 ++++++----
 .../standalone/heapster-controller.yaml                |  5 +++--
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index f53a0bf5652..fa8210b110b 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,5 +1,7 @@
-{% set metrics_memory = "200Mi" -%}
-{% set eventer_memory = "200Mi" -%}
+{% set base_metrics_memory = "200Mi" -%}
+{% set metrics_memory = base_metrics_memory -%}
+{% set base_eventer_memory = "200Mi" -%}
+{% set eventer_memory = base_eventer_memory -%}
 {% set metrics_memory_per_node = 4 -%}
 {% set eventer_memory_per_node = 500 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
@@ -88,7 +90,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{ metrics_memory }}
+            - --memory={{ base_metrics_memory }}
             - --extra-memory={{metrics_memory_per_node}}Mi
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2
@@ -116,7 +118,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{eventer_memory}}
+            - --memory={{base_eventer_memory}}
             - --extra-memory={{eventer_memory_per_node}}Ki
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index b3d93981bb0..0bfbf587ae0 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,5 +1,7 @@
-{% set metrics_memory = "200Mi" -%}
-{% set eventer_memory = "200Mi" -%}
+{% set base_metrics_memory = "200Mi" -%}
+{% set metrics_memory = base_metrics_memory -%}
+{% set base_eventer_memory = "200Mi" -%}
+{% set eventer_memory = base_eventer_memory -%}
 {% set metrics_memory_per_node = 4 -%}
 {% set eventer_memory_per_node = 500 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
@@ -89,7 +91,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{ metrics_memory }}
+            - --memory={{ base_metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2
@@ -117,7 +119,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{ eventer_memory }}
+            - --memory={{ base_eventer_memory }}
             - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index e18837cf0bc..98c5604297c 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,5 +1,7 @@
-{% set metrics_memory = "200Mi" -%}
-{% set eventer_memory = "200Mi" -%}
+{% set base_metrics_memory = "200Mi" -%}
+{% set metrics_memory = base_metrics_memory -%}
+{% set base_eventer_memory = "200Mi" -%}
+{% set eventer_memory = base_eventer_memory -%}
 {% set metrics_memory_per_node = 4 -%}
 {% set eventer_memory_per_node = 500 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
@@ -80,7 +82,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{ metrics_memory }}
+            - --memory={{ base_metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2
@@ -108,7 +110,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{ eventer_memory }}
+            - --memory={{ base_eventer_memory }}
             - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index b2ae37f5021..2a625363e1b 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,4 +1,5 @@
-{% set metrics_memory = "200Mi" -%}
+{% set base_metrics_memory = "200Mi" -%}
+{% set metrics_memory = base_metrics_memory -%}
 {% set metrics_memory_per_node = 4 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
@@ -62,7 +63,7 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory={{ metrics_memory }}
+            - --memory={{ base_metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
             - --deployment=heapster-v1.1.0.beta2