mirror of https://github.com/k3s-io/k3s
Merge pull request #15941 from piosz/hpa-cleanup
Removed flag ENABLE_HORIZONTAL_POD_AUTOSCALER which is no longer usedpull/6/head
commit
fdd2677d23
|
@ -97,13 +97,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then
|
||||||
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
||||||
fi
|
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.
|
# Optional: Enable deployment experimental feature, not ready for production use.
|
||||||
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
||||||
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
||||||
|
|
|
@ -93,13 +93,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then
|
||||||
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
||||||
fi
|
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.
|
# Optional: Enable deployment experimental feature, not ready for production use.
|
||||||
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
||||||
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
||||||
|
|
|
@ -96,13 +96,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then
|
||||||
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
||||||
fi
|
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.
|
# Optional: Enable deployment experimental feature, not ready for production use.
|
||||||
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
||||||
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
||||||
|
|
|
@ -106,13 +106,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then
|
||||||
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
||||||
fi
|
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.
|
# Optional: Enable deployment experimental feature, not ready for production use.
|
||||||
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
||||||
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
||||||
|
|
|
@ -58,13 +58,6 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco
|
||||||
# Optional: Enable experimental API features
|
# Optional: Enable experimental API features
|
||||||
ENABLE_EXPERIMENTAL_API="${KUBE_ENABLE_EXPERIMENTAL_API:-true}"
|
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.
|
# Optional: Enable node logging.
|
||||||
ENABLE_NODE_LOGGING=false
|
ENABLE_NODE_LOGGING=false
|
||||||
LOGGING_DESTINATION=elasticsearch
|
LOGGING_DESTINATION=elasticsearch
|
||||||
|
|
|
@ -240,7 +240,6 @@ case ${JOB_NAME} in
|
||||||
: ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
|
: ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
|
||||||
# Override GCE default for cluster size autoscaling purposes.
|
# Override GCE default for cluster size autoscaling purposes.
|
||||||
ENABLE_CLUSTER_MONITORING="googleinfluxdb"
|
ENABLE_CLUSTER_MONITORING="googleinfluxdb"
|
||||||
ENABLE_HORIZONTAL_POD_AUTOSCALER="true"
|
|
||||||
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
|
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -1025,7 +1024,6 @@ fi
|
||||||
# Shared cluster variables
|
# Shared cluster variables
|
||||||
export E2E_MIN_STARTUP_PODS=${E2E_MIN_STARTUP_PODS:-}
|
export E2E_MIN_STARTUP_PODS=${E2E_MIN_STARTUP_PODS:-}
|
||||||
export KUBE_ENABLE_CLUSTER_MONITORING=${ENABLE_CLUSTER_MONITORING:-}
|
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_DEPLOYMENTS=${ENABLE_DEPLOYMENTS:-}
|
||||||
export KUBE_ENABLE_EXPERIMENTAL_API=${ENABLE_EXPERIMENTAL_API:-}
|
export KUBE_ENABLE_EXPERIMENTAL_API=${ENABLE_EXPERIMENTAL_API:-}
|
||||||
export MASTER_SIZE=${MASTER_SIZE:-}
|
export MASTER_SIZE=${MASTER_SIZE:-}
|
||||||
|
|
Loading…
Reference in New Issue