github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26990 from mwielgus/ca-0.1.2

Browse Source 
Automatic merge from submit-queue

Bump cluster autoscaler version and enable scale down by default

Follow up of https://github.com/kubernetes/contrib/pull/1148. 

cc: @piosz @fgrzadkowski @jszczepkowski
This commit is contained in:
k8s-merge-robot 2016-06-07 19:42:19 -07:00
commit bae931204c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

@ -118,7 +118,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

2
cluster/gce/util.sh
View File

@ -840,7 +840,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:

2
cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
View File

@ -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",