From 27fc7be396aa98a16c1b22a9faddee15a8519c8d Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Mon, 22 May 2017 15:33:10 +0200
Subject: [PATCH] Make CPU request for heapster in kubemark scale with the
 number of Nodes

---
 test/kubemark/resources/heapster_template.json | 3 +--
 test/kubemark/start-kubemark.sh                | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/kubemark/resources/heapster_template.json b/test/kubemark/resources/heapster_template.json
index 1d55467acfd..491596b2ff8 100644
--- a/test/kubemark/resources/heapster_template.json
+++ b/test/kubemark/resources/heapster_template.json
@@ -36,7 +36,7 @@
 					"image": "gcr.io/google_containers/heapster:v1.3.0",
 					"resources": {
 						"requests": {
-							"cpu": "100m",
+							"cpu": "{{METRICS_CPU}}m",
 							"memory": "{{METRICS_MEM}}Mi"
 						}
 					},
@@ -58,7 +58,6 @@
 					"image": "gcr.io/google_containers/heapster:v1.3.0",
 					"resources": {
 						"requests": {
-							"cpu": "100m",
 							"memory": "{{EVENTER_MEM}}Ki"
 						}
 					},
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index c7e3e24df6f..d9a63c2f776 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -302,6 +302,10 @@ current-context: kubemark-context")
   metrics_mem_per_node=4
   metrics_mem=$((200 + ${metrics_mem_per_node}*${NUM_NODES:-10}))
   sed -i'' -e "s/{{METRICS_MEM}}/${metrics_mem}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json"
+  metrics_cpu_per_node_numerator=${NUM_NODES:-10}
+  metrics_cpu_per_node_denumerator=2
+  metrics_cpu=$((80 + metrics_cpu_per_node_numerator / metrics_cpu_per_node_denumerator))
+  sed -i'' -e "s/{{METRICS_CPU}}/${metrics_cpu}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json"
   eventer_mem_per_node=500
   eventer_mem=$((200 * 1024 + ${eventer_mem_per_node}*${NUM_NODES:-10}))
   sed -i'' -e "s/{{EVENTER_MEM}}/${eventer_mem}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json"