From 5d191d877a51b10edd989880a227c4d5473aff44 Mon Sep 17 00:00:00 2001
From: Van Tu <vantu@google.com>
Date: Fri, 10 Aug 2018 10:14:28 -0400
Subject: [PATCH] Populate final scaling policy values for system addon
 optimizations

---
 cluster/gce/gci/configure-helper.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 798a3b298c8..3e74d2f2a91 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -2354,11 +2354,10 @@ EOF
     local -r eventer_memory_per_node="500"
     local -r nanny_memory_per_node="200"
     if [[ "${ENABLE_SYSTEM_ADDON_RESOURCE_OPTIMIZATIONS:-}" == "true" ]]; then
-      # TODO: Set each of the following variables to optimized values.
-      base_metrics_memory="${HEAPSTER_GCP_BASE_MEMORY:-140Mi}"
-      base_metrics_cpu="${HEAPSTER_GCP_BASE_CPU:-80m}"
+      base_metrics_memory="${HEAPSTER_GCP_BASE_MEMORY:-100Mi}"
+      base_metrics_cpu="${HEAPSTER_GCP_BASE_CPU:-10m}"
       metrics_memory_per_node="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}"
-      heapster_min_cluster_size="16"
+      heapster_min_cluster_size="5"
     fi
     if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then
       num_kube_nodes="$((${NUM_NODES}+1))"