Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
db904257
Commit
db904257
authored
Jun 17, 2016
by
k8s-merge-robot
Committed by
GitHub
Jun 17, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #27599 from dchen1107/gci
Automatic merge from submit-queue Fix docker log level on GCI node. Fix #27584 cc/ @a-robinson
parents
808f3ecb
58684a56
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+3
-1
No files found.
cluster/gce/gci/configure-helper.sh
View file @
db904257
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment