mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #27599 from dchen1107/gci
Automatic merge from submit-queue Fix docker log level on GCI node. Fix #27584 cc/ @a-robinson
This commit is contained in:
commit
db904257f9
@ -271,7 +271,9 @@ function assemble-docker-flags {
|
||||
echo "Assemble docker command line flags"
|
||||
local docker_opts="-p /var/run/docker.pid --iptables=false --ip-masq=false"
|
||||
if [[ "${TEST_CLUSTER:-}" == "true" ]]; then
|
||||
docker_opts+=" --debug"
|
||||
docker_opts+=" --log-level=debug"
|
||||
else
|
||||
docker_opts+=" --log-level=warn"
|
||||
fi
|
||||
local use_net_plugin="true"
|
||||
if [[ "${NETWORK_PROVIDER:-}" != "kubenet" && "${NETWORK_PROVIDER:-}" != "cni" ]]; then
|
||||
|
Loading…
Reference in New Issue
Block a user