github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 04:11:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21258 from gmarek/heapster

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-22 01:24:58 -08:00
parent 3868bb433d 9c722ba98e
commit 85018f728e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/trusty/configure.sh
View File

@@ -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