Merge pull request #20922 from mwielgus/e2e_autoscaling

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-09 12:39:32 -08:00
commit ee54afc9ed

View File

@ -440,6 +440,8 @@ case ${JOB_NAME} in
: ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${ENABLE_DEPLOYMENTS:=true}
# Override GCE default for cluster size autoscaling purposes.
ENABLE_CLUSTER_MONITORING="googleinfluxdb"
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
;;