From 89752258ef666e3d6cd1a1031e1eed7ad51cc644 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Thu, 9 Jun 2016 21:37:21 +0200 Subject: [PATCH] Use exponential estimator for Heapster addon resizer --- .../cluster-monitoring/google/heapster-controller.yaml | 10 ++++++---- .../googleinfluxdb/heapster-controller-combined.yaml | 10 ++++++---- .../influxdb/heapster-controller.yaml | 10 ++++++---- .../standalone/heapster-controller.yaml | 5 +++-- cluster/gce/gci/configure-helper.sh | 6 +++--- cluster/gce/trusty/configure-helper.sh | 6 +++--- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index fa8210b110b..9d1c6520007 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -1,6 +1,6 @@ -{% set base_metrics_memory = "200Mi" -%} +{% set base_metrics_memory = "140Mi" -%} {% set metrics_memory = base_metrics_memory -%} -{% set base_eventer_memory = "200Mi" -%} +{% set base_eventer_memory = "190Mi" -%} {% set eventer_memory = base_eventer_memory -%} {% set metrics_memory_per_node = 4 -%} {% set eventer_memory_per_node = 500 -%} @@ -68,7 +68,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/addon-resizer:1.0 + - image: gcr.io/google_containers/addon-resizer:1.2 name: heapster-nanny resources: limits: @@ -96,7 +96,8 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=heapster - --poll-period=300000 - - image: gcr.io/google_containers/addon-resizer:1.0 + - --estimator=exponential + - image: gcr.io/google_containers/addon-resizer:1.2 name: eventer-nanny resources: limits: @@ -124,6 +125,7 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=eventer - --poll-period=300000 + - --estimator=exponential volumes: - name: ssl-certs hostPath: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 0bfbf587ae0..30f880c038c 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -1,6 +1,6 @@ -{% set base_metrics_memory = "200Mi" -%} +{% set base_metrics_memory = "140Mi" -%} {% set metrics_memory = base_metrics_memory -%} -{% set base_eventer_memory = "200Mi" -%} +{% set base_eventer_memory = "190Mi" -%} {% set eventer_memory = base_eventer_memory -%} {% set metrics_memory_per_node = 4 -%} {% set eventer_memory_per_node = 500 -%} @@ -69,7 +69,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/addon-resizer:1.0 + - image: gcr.io/google_containers/addon-resizer:1.2 name: heapster-nanny resources: limits: @@ -97,7 +97,8 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=heapster - --poll-period=300000 - - image: gcr.io/google_containers/addon-resizer:1.0 + - --estimator=exponential + - image: gcr.io/google_containers/addon-resizer:1.2 name: eventer-nanny resources: limits: @@ -125,6 +126,7 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=eventer - --poll-period=300000 + - --estimator=exponential volumes: - name: ssl-certs hostPath: diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 98c5604297c..0f11d692210 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -1,6 +1,6 @@ -{% set base_metrics_memory = "200Mi" -%} +{% set base_metrics_memory = "140Mi" -%} {% set metrics_memory = base_metrics_memory -%} -{% set base_eventer_memory = "200Mi" -%} +{% set base_eventer_memory = "190Mi" -%} {% set eventer_memory = base_eventer_memory -%} {% set metrics_memory_per_node = 4 -%} {% set eventer_memory_per_node = 500 -%} @@ -60,7 +60,7 @@ spec: - /eventer - --source=kubernetes:'' - --sink=influxdb:http://monitoring-influxdb:8086 - - image: gcr.io/google_containers/addon-resizer:1.0 + - image: gcr.io/google_containers/addon-resizer:1.2 name: heapster-nanny resources: limits: @@ -88,7 +88,8 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=heapster - --poll-period=300000 - - image: gcr.io/google_containers/addon-resizer:1.0 + - --estimator=exponential + - image: gcr.io/google_containers/addon-resizer:1.2 name: eventer-nanny resources: limits: @@ -116,4 +117,5 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=eventer - --poll-period=300000 + - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index 2a625363e1b..a5fbc74a8e0 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -1,4 +1,4 @@ -{% set base_metrics_memory = "200Mi" -%} +{% set base_metrics_memory = "140Mi" -%} {% set metrics_memory = base_metrics_memory -%} {% set metrics_memory_per_node = 4 -%} {% set num_nodes = pillar.get('num_nodes', -1) -%} @@ -41,7 +41,7 @@ spec: command: - /heapster - --source=kubernetes.summary_api:'' - - image: gcr.io/google_containers/addon-resizer:1.0 + - image: gcr.io/google_containers/addon-resizer:1.2 name: heapster-nanny resources: limits: @@ -69,3 +69,4 @@ spec: - --deployment=heapster-v1.1.0.beta2 - --container=heapster - --poll-period=300000 + - --estimator=exponential diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index e0de8194b72..23f8b1b9ccb 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -721,14 +721,14 @@ function start-kube-addons { local -r file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}" setup-addon-manifests "addons" "${file_dir}" # Replace the salt configurations with variable values. - base_metrics_memory="200Mi" + base_metrics_memory="140Mi" metrics_memory="${base_metrics_memory}" - base_eventer_memory="200Mi" + base_eventer_memory="190Mi" eventer_memory="${base_eventer_memory}" local -r metrics_memory_per_node="4" local -r eventer_memory_per_node="500" if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then - num_kube_nodes="$((${NUM_NODES}-1))" + num_kube_nodes="$((${NUM_NODES}+1))" metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi" eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" fi diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index ea2905dada0..9e95b3b13f6 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -713,14 +713,14 @@ start_kube_addons() { file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}" setup_addon_manifests "addons" "${file_dir}" # Replace the salt configurations with variable values. - base_metrics_memory="200Mi" + base_metrics_memory="140Mi" metrics_memory="${base_metrics_memory}" - base_eventer_memory="200Mi" + base_eventer_memory="190Mi" eventer_memory="${base_eventer_memory}" 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))" + num_kube_nodes="$((${NUM_NODES}+1))" metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi" eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" fi