github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104135 from vteratipally/master

Browse Source 
Update configure-helper.sh
This commit is contained in:
Kubernetes Prow Robot 2021-08-04 16:13:11 -07:00 committed by GitHub
commit afb8d236f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/gci/configure-helper.sh
View File

@ -1506,11 +1506,12 @@ function set_docker_options_non_ubuntu() {
addockeropt "\"mtu\": 1460," addockeropt "\"mtu\": 1460,"
addockeropt "\"storage-driver\": \"overlay2\"," addockeropt "\"storage-driver\": \"overlay2\","
echo "setting live restore" echo "setting live restore"
# Disable live-restore if the environment variable is set. # Disable live-restore if the environment variable is set.
if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
addockeropt "\"live-restore\": \"false\"," addockeropt "\"live-restore\": false,"
else
addockeropt "\"live-restore\": true,"
fi fi
} }
@ -1558,6 +1559,7 @@ addockeropt "\"pidfile\": \"/var/run/docker.pid\",
disable_aufs disable_aufs
set_docker_options_non_ubuntu set_docker_options_non_ubuntu
echo "setting docker logging options" echo "setting docker logging options"
# Configure docker logging # Configure docker logging
addockeropt "\"log-driver\": \"${DOCKER_LOG_DRIVER:-json-file}\"," addockeropt "\"log-driver\": \"${DOCKER_LOG_DRIVER:-json-file}\","