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
84689a7a
Commit
84689a7a
authored
Mar 01, 2016
by
Dawn Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable --log-level=info for docker daemons for scalability jenkins job and e2e test.
parent
a511961c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
1 deletion
+18
-1
common.sh
cluster/common.sh
+5
-0
config-test.sh
cluster/gce/config-test.sh
+1
-0
configure-vm.sh
cluster/gce/configure-vm.sh
+5
-0
docker-defaults
cluster/saltbase/salt/docker/docker-defaults
+5
-1
kubernetes-e2e.yaml
hack/jenkins/job-configs/kubernetes-e2e.yaml
+2
-0
No files found.
cluster/common.sh
View file @
84689a7a
...
...
@@ -530,6 +530,11 @@ EOF
KUBELET_TEST_LOG_LEVEL:
$(
yaml-quote
${
KUBELET_TEST_LOG_LEVEL
})
EOF
fi
if
[
-n
"
${
DOCKER_TEST_LOG_LEVEL
:-}
"
]
;
then
cat
>>
$file
<<
EOF
DOCKER_TEST_LOG_LEVEL:
$(
yaml-quote
${
DOCKER_TEST_LOG_LEVEL
})
EOF
fi
if
[
-n
"
${
ENABLE_CUSTOM_METRICS
:-}
"
]
;
then
cat
>>
$file
<<
EOF
ENABLE_CUSTOM_METRICS:
$(
yaml-quote
${
ENABLE_CUSTOM_METRICS
})
...
...
cluster/gce/config-test.sh
View file @
84689a7a
...
...
@@ -69,6 +69,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}"
# Default Log level for all components in test clusters and variables to override it in specific components.
TEST_CLUSTER_LOG_LEVEL
=
"
${
TEST_CLUSTER_LOG_LEVEL
:-
--v=4
}
"
KUBELET_TEST_LOG_LEVEL
=
"
${
KUBELET_TEST_LOG_LEVEL
:-
$TEST_CLUSTER_LOG_LEVEL
}
"
DOCKER_TEST_LOG_LEVEL
=
"
${
DOCKER_TEST_LOG_LEVEL
:-
--log-level=info
}
"
API_SERVER_TEST_LOG_LEVEL
=
"
${
API_SERVER_TEST_LOG_LEVEL
:-
$TEST_CLUSTER_LOG_LEVEL
}
"
CONTROLLER_MANAGER_TEST_LOG_LEVEL
=
"
${
CONTROLLER_MANAGER_TEST_LOG_LEVEL
:-
$TEST_CLUSTER_LOG_LEVEL
}
"
SCHEDULER_TEST_LOG_LEVEL
=
"
${
SCHEDULER_TEST_LOG_LEVEL
:-
$TEST_CLUSTER_LOG_LEVEL
}
"
...
...
cluster/gce/configure-vm.sh
View file @
84689a7a
...
...
@@ -464,6 +464,11 @@ EOF
kubelet_test_log_level: '
$(
echo
"
$KUBELET_TEST_LOG_LEVEL
"
|
sed
-e
"s/'/''/g"
)
'
EOF
fi
if
[
-n
"
${
DOCKER_TEST_LOG_LEVEL
:-}
"
]
;
then
cat
<<
EOF
>>/srv/salt-overlay/pillar/cluster-params.sls
docker_test_log_level: '
$(
echo
"
$DOCKER_TEST_LOG_LEVEL
"
|
sed
-e
"s/'/''/g"
)
'
EOF
fi
if
[
-n
"
${
CONTROLLER_MANAGER_TEST_ARGS
:-}
"
]
;
then
cat
<<
EOF
>>/srv/salt-overlay/pillar/cluster-params.sls
controller_manager_test_args: '
$(
echo
"
$CONTROLLER_MANAGER_TEST_ARGS
"
|
sed
-e
"s/'/''/g"
)
'
...
...
cluster/saltbase/salt/docker/docker-defaults
View file @
84689a7a
...
...
@@ -7,5 +7,9 @@
{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
{% set bridge_opts = "" %}
{% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn"
{% set log_level = pillar['log_level'] -%}
{% if pillar['docker_test_log_level'] is defined -%}
{% set log_level = pillar['docker_test_log_level'] -%}
{% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false {{log_level}}"
DOCKER_NOFILE=1000000
hack/jenkins/job-configs/kubernetes-e2e.yaml
View file @
84689a7a
...
...
@@ -139,6 +139,8 @@
export REGISTER_MASTER="true"
# Reduce logs verbosity
export TEST_CLUSTER_LOG_LEVEL="--v=2"
# TODO: Remove when we figure out #22166 and other docker potential slowness
export DOCKER_TEST_LOG_LEVEL="--log-level=info"
# TODO: Remove when we figure out the reason for occasional failures #19048
export KUBELET_TEST_LOG_LEVEL="--v=4"
# Increase resync period to simulate production
...
...
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