Skip to content

Commit 8ea9edb

Browse files
authored
Merge pull request kubernetes#77495 from wanghaoran1988/fix_local_up_script
Enhance the local-up-cluster.sh script to start kubelet using correct cgroup driver.
2 parents 86a0a3d + 37cb774 commit 8ea9edb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hack/local-up-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ if [[ ${CONTAINER_RUNTIME} == "docker" ]]; then
250250
# default cgroup driver to match what is reported by docker to simplify local development
251251
if [[ -z ${CGROUP_DRIVER} ]]; then
252252
# match driver with docker runtime reported value (they must match)
253-
CGROUP_DRIVER=$(docker info | grep "Cgroup Driver:" | cut -f3- -d' ')
253+
CGROUP_DRIVER=$(docker info | grep "Cgroup Driver:" | sed -e 's/^[[:space:]]*//'|cut -f3- -d' ')
254254
echo "Kubelet cgroup driver defaulted to use: ${CGROUP_DRIVER}"
255255
fi
256256
if [[ -f /var/log/docker.log && ! -f "${LOG_DIR}/docker.log" ]]; then

0 commit comments

Comments
 (0)