Merge pull request #13094 from soltysh/fix_local_up

Updated deprecated flags (address and port). Added an option to pass runtime-config.
This commit is contained in:
Yu-Ju Hong 2015-08-25 14:31:57 -07:00
commit a74bea7f32

View File

@ -209,16 +209,20 @@ function start_apiserver {
if [[ -n "${ALLOW_PRIVILEGED}" ]]; then
priv_arg="--allow-privileged "
fi
runtime_config=""
if [[ -n "${RUNTIME_CONFIG}" ]]; then
runtime_config="--runtime-config=\"${RUNTIME_CONFIG}\""
fi
APISERVER_LOG=/tmp/kube-apiserver.log
sudo -E "${GO_OUT}/kube-apiserver" ${priv_arg}\
sudo -E "${GO_OUT}/kube-apiserver" ${priv_arg} ${runtime_config} \
--v=${LOG_LEVEL} \
--cert-dir="${CERT_DIR}" \
--service-account-key-file="${SERVICE_ACCOUNT_KEY}" \
--service-account-lookup="${SERVICE_ACCOUNT_LOOKUP}" \
--admission-control="${ADMISSION_CONTROL}" \
--address="${API_HOST}" \
--port="${API_PORT}" \
--insecure-bind-address="${API_HOST}" \
--insecure-port="${API_PORT}" \
--etcd-servers="http://127.0.0.1:4001" \
--service-cluster-ip-range="10.0.0.0/24" \
--cors-allowed-origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &