Update configure-helper.sh to support heapster resource optimizations

In addition to the shell script changes the heapster yaml has been
updated to use addon resizer 1.8.3 for the heapster-nanny. Addon resizer 1.8.3
is being used to take advantage of the new minClusterSize flag. Note this is a
no-op change. The values specified for heapster-nanny reflect the current
configuration used with version 1.8.2.

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

@@ -79,7 +79,7 @@ spec:
             - /eventer
             - --source=kubernetes:''
             - --sink=gcl
-        - image: k8s.gcr.io/addon-resizer:1.8.2
+        - image: k8s.gcr.io/addon-resizer:1.8.3
           name: heapster-nanny
           resources:
             limits:
@@ -112,6 +112,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
+            - --minClusterSize={{ heapster_min_cluster_size }}
         - image: k8s.gcr.io/addon-resizer:1.8.2
           name: eventer-nanny
           resources:

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

@@ -80,7 +80,7 @@ spec:
             - /eventer
             - --source=kubernetes:''
             - --sink=gcl
-        - image: k8s.gcr.io/addon-resizer:1.8.2
+        - image: k8s.gcr.io/addon-resizer:1.8.3
           name: heapster-nanny
           resources:
             limits:
@@ -113,6 +113,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
+            - --minClusterSize={{ heapster_min_cluster_size }}
         - image: k8s.gcr.io/addon-resizer:1.8.2
           name: eventer-nanny
           resources:

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

@@ -79,7 +79,7 @@ spec:
             - /eventer
             - --source=kubernetes:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-        - image: k8s.gcr.io/addon-resizer:1.8.2
+        - image: k8s.gcr.io/addon-resizer:1.8.3
           name: heapster-nanny
           resources:
             limits:
@@ -112,6 +112,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
+            - --minClusterSize={{ heapster_min_cluster_size }}
         - image: k8s.gcr.io/addon-resizer:1.8.2
           name: eventer-nanny
           resources:

cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml

@@ -80,7 +80,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
         # END_PROMETHEUS_TO_SD
-        - image: k8s.gcr.io/addon-resizer:1.8.2
+        - image: k8s.gcr.io/addon-resizer:1.8.3
           name: heapster-nanny
           resources:
             limits:
@@ -113,6 +113,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
+            - --minClusterSize={{ heapster_min_cluster_size }}
       volumes:
         - name: heapster-config-volume
           configMap:

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

@@ -59,7 +59,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: k8s.gcr.io/addon-resizer:1.8.2
+        - image: k8s.gcr.io/addon-resizer:1.8.3
           name: heapster-nanny
           resources:
             limits:
@@ -92,6 +92,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
+            - --minClusterSize={{ heapster_min_cluster_size }}
       volumes:
         - name: heapster-config-volume
           configMap:

cluster/gce/gci/configure-helper.sh

@@ -2348,10 +2348,18 @@ EOF
     base_eventer_memory="190Mi"
     base_metrics_cpu="${HEAPSTER_GCP_BASE_CPU:-80m}"
     nanny_memory="90Mi"
-    local -r metrics_memory_per_node="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}"
+    local heapster_min_cluster_size="16"
+    local metrics_memory_per_node="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}"
     local -r metrics_cpu_per_node="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}"
     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="140Mi"
+      base_metrics_cpu="80m"
+      metrics_memory_per_node="4"
+      heapster_min_cluster_size="16"
+    fi
     if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then
       num_kube_nodes="$((${NUM_NODES}+1))"
       nanny_memory="$((${num_kube_nodes} * ${nanny_memory_per_node} + 90 * 1024))Ki"
@@ -2372,6 +2380,7 @@ EOF
     sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}"
     sed -i -e "s@{{ *nanny_memory *}}@${nanny_memory}@g" "${controller_yaml}"
     sed -i -e "s@{{ *metrics_cpu_per_node *}}@${metrics_cpu_per_node}@g" "${controller_yaml}"
+    sed -i -e "s@{{ *heapster_min_cluster_size *}}@${heapster_min_cluster_size}@g" "${controller_yaml}"
     update-prometheus-to-sd-parameters ${controller_yaml}
 
     if [[ "${ENABLE_CLUSTER_MONITORING:-}" == "stackdriver" ]]; then