mirror of https://github.com/k3s-io/k3s
Merge pull request #48037 from wanghaoran1988/add_bootstrap_option
Automatic merge from submit-queue (batch tested with PRs 48295, 48298, 47339, 44910, 48037) Make the `--controllers` flag configurable in hack/local-up-cluster.sh **What this PR does / why we need it**: add options to enable tokencleaner,bootstrapsigner controller for bootstrap token testing **Release note**: ``` None ```pull/6/head
commit
a92123c530
|
@ -98,6 +98,9 @@ ADMISSION_CONTROL_CONFIG_FILE=${ADMISSION_CONTROL_CONFIG_FILE:-""}
|
|||
# START_MODE can be 'all', 'kubeletonly', or 'nokubelet'
|
||||
START_MODE=${START_MODE:-"all"}
|
||||
|
||||
# A list of controllers to enable
|
||||
KUBE_CONTROLLERS="${KUBE_CONTROLLERS:-"*"}"
|
||||
|
||||
# sanity check for OpenStack provider
|
||||
if [ "${CLOUD_PROVIDER}" == "openstack" ]; then
|
||||
if [ "${CLOUD_CONFIG}" == "" ]; then
|
||||
|
@ -587,6 +590,7 @@ function start_controller_manager {
|
|||
--cloud-config="${CLOUD_CONFIG}" \
|
||||
--kubeconfig "$CERT_DIR"/controller.kubeconfig \
|
||||
--use-service-account-credentials \
|
||||
--controllers="${KUBE_CONTROLLERS}" \
|
||||
--master="https://${API_HOST}:${API_SECURE_PORT}" >"${CTLRMGR_LOG}" 2>&1 &
|
||||
CTLRMGR_PID=$!
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue