diff --git a/cluster/kubemark/config-default.sh b/cluster/kubemark/config-default.sh index 9cc3d83040e..babcdd6c4c3 100644 --- a/cluster/kubemark/config-default.sh +++ b/cluster/kubemark/config-default.sh @@ -29,7 +29,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NETWORK=${KUBE_GCE_NETWORK:-default} @@ -39,6 +39,20 @@ MASTER_TAG="kubemark-master" MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" +TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} + +# Optional: enable v1beta1 related features +ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-true}" +ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}" + +TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=2}" +TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=12h}" + +KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL" +APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${TEST_CLUSTER_LOG_LEVEL}" +CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PERIOD}" +SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" +KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. POLL_SLEEP_INTERVAL=3