Merge pull request #31165 from derekwaynecarr/fix-local-up-cluster-defaults

Automatic merge from submit-queue

Hack local-up-cluster should enforce cpu limits by default

CPU CFS quota should be enforced by default.

/cc @vishh
This commit is contained in:
Kubernetes Submit Queue 2016-09-19 05:04:59 -07:00 committed by GitHub
commit 8afa8c796f

View File

@ -133,7 +133,7 @@ IMAGE_SERVICE_ENDPOINT=${IMAGE_SERVICE_ENDPOINT:-""}
RKT_PATH=${RKT_PATH:-""}
RKT_STAGE1_IMAGE=${RKT_STAGE1_IMAGE:-""}
CHAOS_CHANCE=${CHAOS_CHANCE:-0.0}
CPU_CFS_QUOTA=${CPU_CFS_QUOTA:-false}
CPU_CFS_QUOTA=${CPU_CFS_QUOTA:-true}
ENABLE_HOSTPATH_PROVISIONER=${ENABLE_HOSTPATH_PROVISIONER:-"false"}
CLAIM_BINDER_SYNC_PERIOD=${CLAIM_BINDER_SYNC_PERIOD:-"15s"} # current k8s default
ENABLE_CONTROLLER_ATTACH_DETACH=${ENABLE_CONTROLLER_ATTACH_DETACH:-"true"} # current default