From bfd68b35d8398e5451fdb7740b4b17e31a92e5e6 Mon Sep 17 00:00:00 2001 From: Andy Zheng Date: Wed, 23 Mar 2016 19:27:30 -0700 Subject: [PATCH] Trusty: Update heapster manifest handling code --- cluster/gce/trusty/configure-helper.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 75fb2a31cc..8809596285 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -605,10 +605,12 @@ prepare_kube_addons() { # Replace the salt configurations with variable values. metrics_memory="200Mi" eventer_memory="200Mi" + readonly metrics_memory_per_node="4" + readonly eventer_memory_per_node="500" if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -ge 1 ]; then num_kube_nodes="$((${NUM_NODES}-1))" - metrics_memory="$((${num_kube_nodes} * 4 + 200))Mi" - eventer_memory="$((${num_kube_nodes} * 500 + 200 * 1024))Ki" + metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi" + eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" fi controller_yaml="${addon_dst_dir}/${file_dir}" if [ "${ENABLE_CLUSTER_MONITORING:-}" = "googleinfluxdb" ]; then @@ -619,6 +621,8 @@ prepare_kube_addons() { remove_salt_config_comments "${controller_yaml}" sed -i -e "s@{{ *metrics_memory *}}@${metrics_memory}@g" "${controller_yaml}" sed -i -e "s@{{ *eventer_memory *}}@${eventer_memory}@g" "${controller_yaml}" + sed -i -e "s@{{ *metrics_memory_per_node *}}@${metrics_memory_per_node}@g" "${controller_yaml}" + sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}" fi cp "${addon_src_dir}/namespace.yaml" "${addon_dst_dir}" if [ "${ENABLE_L7_LOADBALANCING:-}" = "glbc" ]; then