Commit dffac87c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #33501 from bprashanth/feature_gate

Automatic merge from submit-queue Enable alpha features in local-up-cluster because why not
parents a241daf3 076e283b
...@@ -42,6 +42,8 @@ ENABLE_DAEMON=${ENABLE_DAEMON:-false} ...@@ -42,6 +42,8 @@ ENABLE_DAEMON=${ENABLE_DAEMON:-false}
HOSTNAME_OVERRIDE=${HOSTNAME_OVERRIDE:-"127.0.0.1"} HOSTNAME_OVERRIDE=${HOSTNAME_OVERRIDE:-"127.0.0.1"}
CLOUD_PROVIDER=${CLOUD_PROVIDER:-""} CLOUD_PROVIDER=${CLOUD_PROVIDER:-""}
CLOUD_CONFIG=${CLOUD_CONFIG:-""} CLOUD_CONFIG=${CLOUD_CONFIG:-""}
FEATURE_GATES=${FEATURE_GATES:-"AllAlpha=true"}
# START_MODE can be 'all', 'kubeletonly', or 'nokubelet' # START_MODE can be 'all', 'kubeletonly', or 'nokubelet'
START_MODE=${START_MODE:-"all"} START_MODE=${START_MODE:-"all"}
...@@ -313,6 +315,7 @@ function start_apiserver { ...@@ -313,6 +315,7 @@ function start_apiserver {
--insecure-port="${API_PORT}" \ --insecure-port="${API_PORT}" \
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \ --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
--service-cluster-ip-range="${SERVICE_CLUSTER_IP_RANGE}" \ --service-cluster-ip-range="${SERVICE_CLUSTER_IP_RANGE}" \
--feature-gates="${FEATURE_GATES}" \
--cloud-provider="${CLOUD_PROVIDER}" \ --cloud-provider="${CLOUD_PROVIDER}" \
--cloud-config="${CLOUD_CONFIG}" \ --cloud-config="${CLOUD_CONFIG}" \
--cors-allowed-origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 & --cors-allowed-origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
...@@ -337,6 +340,7 @@ function start_controller_manager { ...@@ -337,6 +340,7 @@ function start_controller_manager {
--enable-hostpath-provisioner="${ENABLE_HOSTPATH_PROVISIONER}" \ --enable-hostpath-provisioner="${ENABLE_HOSTPATH_PROVISIONER}" \
${node_cidr_args} \ ${node_cidr_args} \
--pvclaimbinder-sync-period="${CLAIM_BINDER_SYNC_PERIOD}" \ --pvclaimbinder-sync-period="${CLAIM_BINDER_SYNC_PERIOD}" \
--feature-gates="${FEATURE_GATES}" \
--cloud-provider="${CLOUD_PROVIDER}" \ --cloud-provider="${CLOUD_PROVIDER}" \
--cloud-config="${CLOUD_CONFIG}" \ --cloud-config="${CLOUD_CONFIG}" \
--master="${API_HOST}:${API_PORT}" >"${CTLRMGR_LOG}" 2>&1 & --master="${API_HOST}:${API_PORT}" >"${CTLRMGR_LOG}" 2>&1 &
...@@ -379,7 +383,7 @@ function start_kubelet { ...@@ -379,7 +383,7 @@ function start_kubelet {
if [[ -n "${NET_PLUGIN}" ]]; then if [[ -n "${NET_PLUGIN}" ]]; then
net_plugin_args="--network-plugin=${NET_PLUGIN}" net_plugin_args="--network-plugin=${NET_PLUGIN}"
fi fi
net_plugin_dir_args="" net_plugin_dir_args=""
if [[ -n "${NET_PLUGIN_DIR}" ]]; then if [[ -n "${NET_PLUGIN_DIR}" ]]; then
net_plugin_dir_args="--network-plugin-dir=${NET_PLUGIN_DIR}" net_plugin_dir_args="--network-plugin-dir=${NET_PLUGIN_DIR}"
...@@ -411,6 +415,7 @@ function start_kubelet { ...@@ -411,6 +415,7 @@ function start_kubelet {
--cloud-config="${CLOUD_CONFIG}" \ --cloud-config="${CLOUD_CONFIG}" \
--address="${KUBELET_HOST}" \ --address="${KUBELET_HOST}" \
--api-servers="${API_HOST}:${API_PORT}" \ --api-servers="${API_HOST}:${API_PORT}" \
--feature-gates="${FEATURE_GATES}" \
--cpu-cfs-quota=${CPU_CFS_QUOTA} \ --cpu-cfs-quota=${CPU_CFS_QUOTA} \
--enable-controller-attach-detach="${ENABLE_CONTROLLER_ATTACH_DETACH}" \ --enable-controller-attach-detach="${ENABLE_CONTROLLER_ATTACH_DETACH}" \
${dns_args} \ ${dns_args} \
...@@ -427,7 +432,7 @@ function start_kubelet { ...@@ -427,7 +432,7 @@ function start_kubelet {
# dockerized kubelet that might be running. # dockerized kubelet that might be running.
cleanup_dockerized_kubelet cleanup_dockerized_kubelet
cred_bind="" cred_bind=""
# path to cloud credentails. # path to cloud credentails.
cloud_cred="" cloud_cred=""
if [ "${CLOUD_PROVIDER}" == "aws" ]; then if [ "${CLOUD_PROVIDER}" == "aws" ]; then
cloud_cred="${HOME}/.aws/credentials" cloud_cred="${HOME}/.aws/credentials"
...@@ -464,6 +469,7 @@ function start_kubeproxy { ...@@ -464,6 +469,7 @@ function start_kubeproxy {
sudo -E "${GO_OUT}/hyperkube" proxy \ sudo -E "${GO_OUT}/hyperkube" proxy \
--v=${LOG_LEVEL} \ --v=${LOG_LEVEL} \
--hostname-override="${HOSTNAME_OVERRIDE}" \ --hostname-override="${HOSTNAME_OVERRIDE}" \
--feature-gates="${FEATURE_GATES}" \
--master="http://${API_HOST}:${API_PORT}" >"${PROXY_LOG}" 2>&1 & --master="http://${API_HOST}:${API_PORT}" >"${PROXY_LOG}" 2>&1 &
PROXY_PID=$! PROXY_PID=$!
...@@ -545,7 +551,7 @@ To start using your cluster, open up another terminal/tab and run: ...@@ -545,7 +551,7 @@ To start using your cluster, open up another terminal/tab and run:
cluster/kubectl.sh config use-context local cluster/kubectl.sh config use-context local
cluster/kubectl.sh cluster/kubectl.sh
EOF EOF
else else
cat <<EOF cat <<EOF
The kubelet was started. The kubelet was started.
...@@ -586,7 +592,7 @@ fi ...@@ -586,7 +592,7 @@ fi
if [[ "${START_MODE}" != "nokubelet" ]]; then if [[ "${START_MODE}" != "nokubelet" ]]; then
start_kubelet start_kubelet
fi fi
print_success print_success
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment