This PR adds a new environmental variable ENABLE_CRI for customing

CRI config.

Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
pull/6/head
Pengfei Ni 2017-03-01 15:21:13 +08:00
parent 336203a69b
commit 36f551ab1d
1 changed files with 2 additions and 1 deletions

View File

@ -187,6 +187,7 @@ LOG_LEVEL=${LOG_LEVEL:-3}
CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-"docker"}
CONTAINER_RUNTIME_ENDPOINT=${CONTAINER_RUNTIME_ENDPOINT:-""}
IMAGE_SERVICE_ENDPOINT=${IMAGE_SERVICE_ENDPOINT:-""}
ENABLE_CRI=${ENABLE_CRI:-"true"}
RKT_PATH=${RKT_PATH:-""}
RKT_STAGE1_IMAGE=${RKT_STAGE1_IMAGE:-""}
CHAOS_CHANCE=${CHAOS_CHANCE:-0.0}
@ -576,7 +577,7 @@ function start_kubelet {
fi
sudo -E "${GO_OUT}/hyperkube" kubelet ${priv_arg}\
--enable-cri=false \
--enable-cri="${ENABLE_CRI}" \
--v=${LOG_LEVEL} \
--chaos-chance="${CHAOS_CHANCE}" \
--container-runtime="${CONTAINER_RUNTIME}" \