From c191c72063e7c972b6f635834ab9d04d32eeeb17 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Tue, 7 Jun 2016 21:42:56 +0200 Subject: [PATCH] Bump cluster autoscaler version and enable scale down by default --- cluster/gce/config-default.sh | 2 +- cluster/gce/util.sh | 2 +- .../salt/cluster-autoscaler/cluster-autoscaler.manifest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index c53995d2b74..96a929ee631 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -115,7 +115,7 @@ ENABLE_NODE_AUTOSCALER="${KUBE_ENABLE_NODE_AUTOSCALER:-false}" if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then AUTOSCALER_MIN_NODES="${KUBE_AUTOSCALER_MIN_NODES:-}" AUTOSCALER_MAX_NODES="${KUBE_AUTOSCALER_MAX_NODES:-}" - AUTOSCALER_ENABLE_SCALE_DOWN="${KUBE_AUTOSCALER_ENABLE_SCALE_DOWN:-false}" + AUTOSCALER_ENABLE_SCALE_DOWN="${KUBE_AUTOSCALER_ENABLE_SCALE_DOWN:-true}" fi # Admission Controllers to invoke prior to persisting objects in cluster diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 28c491073e3..b5a2b4d3b92 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -836,7 +836,7 @@ function create-cluster-autoscaler-mig-config() { AUTOSCALER_MIG_CONFIG="${AUTOSCALER_MIG_CONFIG} --nodes=${this_mig_min}:${this_mig_max}:${mig_url}" done - AUTOSCALER_MIG_CONFIG="${AUTOSCALER_MIG_CONFIG} --experimental-scale-down-enabled=${AUTOSCALER_ENABLE_SCALE_DOWN}" + AUTOSCALER_MIG_CONFIG="${AUTOSCALER_MIG_CONFIG} --scale-down-enabled=${AUTOSCALER_ENABLE_SCALE_DOWN}" } # Assumes: diff --git a/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest b/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest index 010a3dcf3f0..56c22d07a45 100644 --- a/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest +++ b/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest @@ -25,7 +25,7 @@ "containers": [ { "name": "cluster-autoscaler", - "image": "gcr.io/google_containers/cluster-autoscaler:v0.1.1", + "image": "gcr.io/google_containers/cluster-autoscaler:v0.1.2", "command": [ "/bin/sh", "-c",