Skip to content

Commit

Permalink
Merge pull request kubernetes#103927 from lizhuqi/automated-cherry-pi…
Browse files Browse the repository at this point in the history
…ck-of-#103831-upstream-release-1.21

Automated cherry pick of kubernetes#103831: disable aufs module
  • Loading branch information
k8s-ci-robot authored Jul 28, 2021
2 parents 1688b70 + c6304d0 commit 4b53d73
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,13 @@ EOF
fi
}

function disable_aufs() {
# disable aufs module if aufs is loaded
if lsmod | grep "aufs" &> /dev/null ; then
sudo modprobe -r aufs
fi
}

function set_docker_options_non_ubuntu() {
# set docker options mtu and storage driver for non-ubuntu
# as it is default for ubuntu
Expand Down Expand Up @@ -1539,7 +1546,8 @@ addockeropt "\"pidfile\": \"/var/run/docker.pid\",
if [[ -n "${DOCKER_REGISTRY_MIRROR_URL:-}" ]]; then
docker_opts+="--registry-mirror=${DOCKER_REGISTRY_MIRROR_URL} "
fi


disable_aufs
set_docker_options_non_ubuntu

echo "setting docker logging options"
Expand Down

0 comments on commit 4b53d73

Please sign in to comment.