mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-13 05:02:50 +00:00
Remove ENABLE_EXPERIMENTAL_API and similar in favor of KUBE_RUNTIME_CONFIG.
Addresses #15968 This patch removes KUBE_ENABLE_EXPERIMENTAL_API and similar calls in favor of specifying desired features in KUBE_RUNTIME_CONFIG. Changes have also been made to e2e scripts to re-enable using KUBE_RUNTIME_CONFIG rather than EXPERIMENTAL_API env vars. This also introduces KUBE_ENABLE_DAEMONSETS and KUBE_ENABLE_DEPLOYMENTS. Signed-off-by: Christian Stewart <christian@paral.in>
This commit is contained in:
@@ -80,7 +80,10 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
|
||||
# Otherwise amazon-given public ip will be used (it'll change with reboot).
|
||||
MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
|
||||
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
|
||||
ENABLE_EXPERIMENTAL_API="${KUBE_ENABLE_EXPERIMENTAL_API:-false}"
|
||||
|
||||
# Enable various v1beta1 features
|
||||
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-}"
|
||||
ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-}"
|
||||
|
||||
# Optional: Cluster monitoring to setup as part of the cluster bring up:
|
||||
# none - No cluster monitoring setup
|
||||
@@ -118,12 +121,6 @@ if [[ "${ENABLE_NODE_AUTOSCALER}" == "true" ]]; then
|
||||
TARGET_NODE_UTILIZATION="${KUBE_TARGET_NODE_UTILIZATION:-0.7}"
|
||||
fi
|
||||
|
||||
# Optional: Enable deployment experimental feature, not ready for production use.
|
||||
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-false}"
|
||||
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
|
||||
ENABLE_EXPERIMENTAL_API=true
|
||||
fi
|
||||
|
||||
# Admission Controllers to invoke prior to persisting objects in cluster
|
||||
ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
|
||||
|
||||
|
Reference in New Issue
Block a user