mirror of https://github.com/k3s-io/k3s
Convert hack/ from --flag_name= to --flag-name=
Eric Paris
parent
86ca88be61
commit
7715290bbd
|
|
@ -213,15 +213,15 @@ function start_apiserver {
|
|||
APISERVER_LOG=/tmp/kube-apiserver.log
|
||||
sudo -E "${GO_OUT}/kube-apiserver" ${priv_arg}\
|
||||
--v=${LOG_LEVEL} \
|
||||
--cert_dir="${CERT_DIR}" \
|
||||
--service_account_key_file="${SERVICE_ACCOUNT_KEY}" \
|
||||
--service_account_lookup="${SERVICE_ACCOUNT_LOOKUP}" \
|
||||
--admission_control="${ADMISSION_CONTROL}" \
|
||||
--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}" \
|
||||
--etcd_servers="http://127.0.0.1:4001" \
|
||||
--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 &
|
||||
--cors-allowed-origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
|
||||
APISERVER_PID=$!
|
||||
|
||||
# Wait for kube-apiserver to come up before launching the rest of the components.
|
||||
|
|
@ -233,8 +233,8 @@ function start_controller_manager {
|
|||
CTLRMGR_LOG=/tmp/kube-controller-manager.log
|
||||
sudo -E "${GO_OUT}/kube-controller-manager" \
|
||||
--v=${LOG_LEVEL} \
|
||||
--service_account_private_key_file="${SERVICE_ACCOUNT_KEY}" \
|
||||
--root_ca_file="${ROOT_CA_FILE}" \
|
||||
--service-account-private-key-file="${SERVICE_ACCOUNT_KEY}" \
|
||||
--root-ca-file="${ROOT_CA_FILE}" \
|
||||
--master="${API_HOST}:${API_PORT}" >"${CTLRMGR_LOG}" 2>&1 &
|
||||
CTLRMGR_PID=$!
|
||||
}
|
||||
|
|
@ -244,11 +244,11 @@ function start_kubelet {
|
|||
if [[ -z "${DOCKERIZE_KUBELET}" ]]; then
|
||||
sudo -E "${GO_OUT}/kubelet" ${priv_arg}\
|
||||
--v=${LOG_LEVEL} \
|
||||
--chaos_chance="${CHAOS_CHANCE}" \
|
||||
--container_runtime="${CONTAINER_RUNTIME}" \
|
||||
--hostname_override="127.0.0.1" \
|
||||
--chaos-chance="${CHAOS_CHANCE}" \
|
||||
--container-runtime="${CONTAINER_RUNTIME}" \
|
||||
--hostname-override="127.0.0.1" \
|
||||
--address="127.0.0.1" \
|
||||
--api_servers="${API_HOST}:${API_PORT}" \
|
||||
--api-servers="${API_HOST}:${API_PORT}" \
|
||||
--port="$KUBELET_PORT" >"${KUBELET_LOG}" 2>&1 &
|
||||
KUBELET_PID=$!
|
||||
else
|
||||
|
|
|
|||
|
|
@ -99,29 +99,29 @@ kube::log::status "Running kubectl with no options"
|
|||
|
||||
kube::log::status "Starting kubelet in masterless mode"
|
||||
"${KUBE_OUTPUT_HOSTBIN}/kubelet" \
|
||||
--really_crash_for_testing=true \
|
||||
--root_dir=/tmp/kubelet.$$ \
|
||||
--cert_dir="${TMPDIR:-/tmp/}" \
|
||||
--docker_endpoint="fake://" \
|
||||
--hostname_override="127.0.0.1" \
|
||||
--really-crash-for-testing=true \
|
||||
--root-dir=/tmp/kubelet.$$ \
|
||||
--cert-dir="${TMPDIR:-/tmp/}" \
|
||||
--docker-endpoint="fake://" \
|
||||
--hostname-override="127.0.0.1" \
|
||||
--address="127.0.0.1" \
|
||||
--port="$KUBELET_PORT" \
|
||||
--healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 &
|
||||
--healthz-port="${KUBELET_HEALTHZ_PORT}" 1>&2 &
|
||||
KUBELET_PID=$!
|
||||
kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet(masterless)"
|
||||
kill ${KUBELET_PID} 1>&2 2>/dev/null
|
||||
|
||||
kube::log::status "Starting kubelet in masterful mode"
|
||||
"${KUBE_OUTPUT_HOSTBIN}/kubelet" \
|
||||
--really_crash_for_testing=true \
|
||||
--root_dir=/tmp/kubelet.$$ \
|
||||
--cert_dir="${TMPDIR:-/tmp/}" \
|
||||
--docker_endpoint="fake://" \
|
||||
--hostname_override="127.0.0.1" \
|
||||
--really-crash-for-testing=true \
|
||||
--root-dir=/tmp/kubelet.$$ \
|
||||
--cert-dir="${TMPDIR:-/tmp/}" \
|
||||
--docker-endpoint="fake://" \
|
||||
--hostname-override="127.0.0.1" \
|
||||
--address="127.0.0.1" \
|
||||
--api_servers="${API_HOST}:${API_PORT}" \
|
||||
--api-servers="${API_HOST}:${API_PORT}" \
|
||||
--port="$KUBELET_PORT" \
|
||||
--healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 &
|
||||
--healthz-port="${KUBELET_HEALTHZ_PORT}" 1>&2 &
|
||||
KUBELET_PID=$!
|
||||
|
||||
kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet"
|
||||
|
|
@ -130,13 +130,13 @@ kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kub
|
|||
kube::log::status "Starting kube-apiserver"
|
||||
KUBE_API_VERSIONS="v1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
|
||||
--address="127.0.0.1" \
|
||||
--public_address_override="127.0.0.1" \
|
||||
--public-address-override="127.0.0.1" \
|
||||
--port="${API_PORT}" \
|
||||
--etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
||||
--public_address_override="127.0.0.1" \
|
||||
--kubelet_port=${KUBELET_PORT} \
|
||||
--runtime_config=api/v1 \
|
||||
--cert_dir="${TMPDIR:-/tmp/}" \
|
||||
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
||||
--public-address-override="127.0.0.1" \
|
||||
--kubelet-port=${KUBELET_PORT} \
|
||||
--runtime-config=api/v1 \
|
||||
--cert-dir="${TMPDIR:-/tmp/}" \
|
||||
--service-cluster-ip-range="10.0.0.0/24" 1>&2 &
|
||||
APISERVER_PID=$!
|
||||
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ function startApiServer() {
|
|||
KUBE_API_VERSIONS="${KUBE_API_VERSIONS}" \
|
||||
"${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
|
||||
--address="127.0.0.1" \
|
||||
--public_address_override="127.0.0.1" \
|
||||
--public-address-override="127.0.0.1" \
|
||||
--port="${API_PORT}" \
|
||||
--etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
||||
--public_address_override="127.0.0.1" \
|
||||
--kubelet_port=${KUBELET_PORT} \
|
||||
--runtime_config="${RUNTIME_CONFIG}" \
|
||||
--cert_dir="${TMPDIR:-/tmp/}" \
|
||||
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
||||
--public-address-override="127.0.0.1" \
|
||||
--kubelet-port=${KUBELET_PORT} \
|
||||
--runtime-config="${RUNTIME_CONFIG}" \
|
||||
--cert-dir="${TMPDIR:-/tmp/}" \
|
||||
--service-cluster-ip-range="10.0.0.0/24" 1>&2 &
|
||||
APISERVER_PID=$!
|
||||
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@ KUBELET_PORT=${KUBELET_PORT:-10250}
|
|||
kube::log::status "Starting kube-apiserver"
|
||||
KUBE_API_VERSIONS="v1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
|
||||
--address="127.0.0.1" \
|
||||
--public_address_override="127.0.0.1" \
|
||||
--public-address-override="127.0.0.1" \
|
||||
--port="${API_PORT}" \
|
||||
--etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
||||
--public_address_override="127.0.0.1" \
|
||||
--kubelet_port=${KUBELET_PORT} \
|
||||
--runtime_config=api/v1 \
|
||||
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
|
||||
--public-address-override="127.0.0.1" \
|
||||
--kubelet-port=${KUBELET_PORT} \
|
||||
--runtime-config=api/v1 \
|
||||
--service-cluster-ip-range="10.0.0.0/24" >/dev/null 2>&1 &
|
||||
APISERVER_PID=$!
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue