github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46224 from gmarek/kubemark_heapster

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46133, 46211, 46224, 46205, 45910)

Make CPU request for heapster in kubemark scale with the number of Nodes
This commit is contained in:
Kubernetes Submit Queue 2017-05-22 15:50:03 -07:00 committed by GitHub
commit 03ba1324cf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/kubemark/resources/heapster_template.json
View File

@ -36,7 +36,7 @@
"image": "gcr.io/google_containers/heapster:v1.3.0", "image": "gcr.io/google_containers/heapster:v1.3.0",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "100m", "cpu": "{{METRICS_CPU}}m",
"memory": "{{METRICS_MEM}}Mi" "memory": "{{METRICS_MEM}}Mi"
} }
}, },
@ -58,7 +58,6 @@
"image": "gcr.io/google_containers/heapster:v1.3.0", "image": "gcr.io/google_containers/heapster:v1.3.0",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "100m",
"memory": "{{EVENTER_MEM}}Ki" "memory": "{{EVENTER_MEM}}Ki"
} }
}, },

4
test/kubemark/start-kubemark.sh
View File

@ -302,6 +302,10 @@ current-context: kubemark-context")
metrics_mem_per_node=4 metrics_mem_per_node=4
metrics_mem=$((200 + ${metrics_mem_per_node}*${NUM_NODES:-10})) metrics_mem=$((200 + ${metrics_mem_per_node}*${NUM_NODES:-10}))
sed -i'' -e "s/{{METRICS_MEM}}/${metrics_mem}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json" 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_per_node=500
eventer_mem=$((200 * 1024 + ${eventer_mem_per_node}*${NUM_NODES:-10})) 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" sed -i'' -e "s/{{EVENTER_MEM}}/${eventer_mem}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json"