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

Merge pull request #27599 from dchen1107/gci

Browse Source 
Automatic merge from submit-queue

Fix docker log level on GCI node.

Fix #27584

cc/ @a-robinson
This commit is contained in:
k8s-merge-robot 2016-06-17 20:21:05 -07:00 committed by GitHub
commit db904257f9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,9 @@ function assemble-docker-flags {
echo "Assemble docker command line flags" echo "Assemble docker command line flags"
local docker_opts="-p /var/run/docker.pid --iptables=false --ip-masq=false" local docker_opts="-p /var/run/docker.pid --iptables=false --ip-masq=false"
if [[ "${TEST_CLUSTER:-}" == "true" ]]; then if [[ "${TEST_CLUSTER:-}" == "true" ]]; then
docker_opts+=" --debug" docker_opts+=" --log-level=debug"
else
docker_opts+=" --log-level=warn"
fi fi
local use_net_plugin="true" local use_net_plugin="true"
if [[ "${NETWORK_PROVIDER:-}" != "kubenet" && "${NETWORK_PROVIDER:-}" != "cni" ]]; then if [[ "${NETWORK_PROVIDER:-}" != "kubenet" && "${NETWORK_PROVIDER:-}" != "cni" ]]; then