diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index d0548fbe7e5..610f656f9cb 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -97,13 +97,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}" fi -# Optional: Enable feature for autoscaling number of pods -# Experimental feature, not ready for production use. -ENABLE_HORIZONTAL_POD_AUTOSCALER="${KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER:-false}" -if [[ "${ENABLE_HORIZONTAL_POD_AUTOSCALER}" == "true" ]]; then - ENABLE_EXPERIMENTAL_API=true -fi - # Optional: Enable deployment experimental feature, not ready for production use. ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}" if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 685eaf48d65..fc9d93e8c5e 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -93,13 +93,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}" fi -# Optional: Enable feature for autoscaling number of pods -# Experimental feature, not ready for production use. -ENABLE_HORIZONTAL_POD_AUTOSCALER="${KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER:-false}" -if [[ "${ENABLE_HORIZONTAL_POD_AUTOSCALER}" == "true" ]]; then - ENABLE_EXPERIMENTAL_API=true -fi - # Optional: Enable deployment experimental feature, not ready for production use. ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}" if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index c712223044b..1edb52879b6 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -96,13 +96,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}" fi -# Optional: Enable feature for autoscaling number of pods -# Experimental feature, not ready for production use. -ENABLE_HORIZONTAL_POD_AUTOSCALER="${KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER:-false}" -if [[ "${ENABLE_HORIZONTAL_POD_AUTOSCALER}" == "true" ]]; then - ENABLE_EXPERIMENTAL_API=true -fi - # Optional: Enable deployment experimental feature, not ready for production use. ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}" if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 8c12a6aced0..2faa613763d 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -106,13 +106,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}" fi -# Optional: Enable feature for autoscaling number of pods -# Experimental feature, not ready for production use. -ENABLE_HORIZONTAL_POD_AUTOSCALER="${KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER:-false}" -if [[ "${ENABLE_HORIZONTAL_POD_AUTOSCALER}" == "true" ]]; then - ENABLE_EXPERIMENTAL_API=true -fi - # Optional: Enable deployment experimental feature, not ready for production use. ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}" if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index ecedc67ab87..65eff2adf79 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -58,13 +58,6 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco # Optional: Enable experimental API features ENABLE_EXPERIMENTAL_API="${KUBE_ENABLE_EXPERIMENTAL_API:-true}" -# Optional: Enable feature for autoscaling number of pods -# Experimental feature, not ready for production use. -ENABLE_HORIZONTAL_POD_AUTOSCALER="${KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER:-true}" -if [[ "${ENABLE_HORIZONTAL_POD_AUTOSCALER}" == "true" ]]; then - ENABLE_EXPERIMENTAL_API=true -fi - # Optional: Enable node logging. ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 82dbddbb37b..d25cb337c0c 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -240,7 +240,6 @@ case ${JOB_NAME} in : ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"} # Override GCE default for cluster size autoscaling purposes. ENABLE_CLUSTER_MONITORING="googleinfluxdb" - ENABLE_HORIZONTAL_POD_AUTOSCALER="true" ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" ;; @@ -1025,7 +1024,6 @@ fi # Shared cluster variables export E2E_MIN_STARTUP_PODS=${E2E_MIN_STARTUP_PODS:-} export KUBE_ENABLE_CLUSTER_MONITORING=${ENABLE_CLUSTER_MONITORING:-} -export KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER=${ENABLE_HORIZONTAL_POD_AUTOSCALER:-} export KUBE_ENABLE_DEPLOYMENTS=${ENABLE_DEPLOYMENTS:-} export KUBE_ENABLE_EXPERIMENTAL_API=${ENABLE_EXPERIMENTAL_API:-} export MASTER_SIZE=${MASTER_SIZE:-}