diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 1edb52879b..a40ed47b2f 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -101,6 +101,11 @@ ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}" if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then ENABLE_EXPERIMENTAL_API=true fi +# Optional: Enable daemonset experimental feature, not ready for production use. +ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-false}" +if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then + ENABLE_EXPERIMENTAL_API=true +fi # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 2faa613763..32cab384e8 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -46,7 +46,7 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.245.0.0/16}" MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" MINION_SCOPES="${MINION_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" -ENABLE_EXPERIMENTAL_API="${KUBE_ENABLE_EXPERIMENTAL_API:-false}" +ENABLE_EXPERIMENTAL_API="${KUBE_ENABLE_EXPERIMENTAL_API:-true}" TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. @@ -112,6 +112,12 @@ if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then ENABLE_EXPERIMENTAL_API=true fi +# Optional: Enable daemonset experimental feature, not ready for production use. +ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}" +if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then + ENABLE_EXPERIMENTAL_API=true +fi + ADMISSION_CONTROL="${KUBE_ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota}" # Optional: if set to true kube-up will automatically check for existing resources and clean them up. diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 9871678920..8ff6c5461f 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -66,6 +66,13 @@ function verify-prereqs { RUNTIME_CONFIG="${RUNTIME_CONFIG},extensions/v1beta1/deployments=true" fi fi + if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then + if [[ -z "${RUNTIME_CONFIG}" ]]; then + RUNTIME_CONFIG="extensions/v1beta1/daemonsets=true" + else + RUNTIME_CONFIG="${RUNTIME_CONFIG},extensions/v1beta1/daemonsets=true" + fi + fi local cmd