mirror of https://github.com/k3s-io/k3s
Enable --log-level=info for docker daemons for jenkins jobs and e2e tests except soak-continuous.
parent
4d599ea309
commit
fd10ca2f45
|
@ -537,6 +537,11 @@ EOF
|
||||||
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
|
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
|
||||||
cat >>$file <<EOF
|
cat >>$file <<EOF
|
||||||
KUBELET_TEST_LOG_LEVEL: $(yaml-quote ${KUBELET_TEST_LOG_LEVEL})
|
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
|
EOF
|
||||||
fi
|
fi
|
||||||
if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then
|
if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then
|
||||||
|
|
|
@ -76,6 +76,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.
|
# 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}"
|
TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}"
|
||||||
KUBELET_TEST_LOG_LEVEL="${KUBELET_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
|
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}"
|
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}"
|
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}"
|
SCHEDULER_TEST_LOG_LEVEL="${SCHEDULER_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
|
||||||
|
|
|
@ -464,6 +464,11 @@ EOF
|
||||||
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
|
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
|
||||||
cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
|
cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
|
||||||
kubelet_test_log_level: '$(echo "$KUBELET_TEST_LOG_LEVEL" | sed -e "s/'/''/g")'
|
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
|
EOF
|
||||||
fi
|
fi
|
||||||
if [ -n "${CONTROLLER_MANAGER_TEST_ARGS:-}" ]; then
|
if [ -n "${CONTROLLER_MANAGER_TEST_ARGS:-}" ]; then
|
||||||
|
|
|
@ -7,5 +7,9 @@
|
||||||
{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
|
{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
|
||||||
{% set bridge_opts = "" %}
|
{% set bridge_opts = "" %}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn"
|
{% set log_level = "--log-level=warn" -%}
|
||||||
|
{% 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
|
DOCKER_NOFILE=1000000
|
||||||
|
|
|
@ -80,6 +80,8 @@
|
||||||
export E2E_DOWN="false"
|
export E2E_DOWN="false"
|
||||||
# Clear out any orphaned namespaces in case previous run was interrupted.
|
# Clear out any orphaned namespaces in case previous run was interrupted.
|
||||||
export E2E_CLEAN_START="true"
|
export E2E_CLEAN_START="true"
|
||||||
|
# TODO: Remove when we figure out #22166 and other docker potential slowness.
|
||||||
|
export DOCKER_TEST_LOG_LEVEL="--log-level=warn"
|
||||||
# We should be testing the reliability of a long-running cluster. The
|
# We should be testing the reliability of a long-running cluster. The
|
||||||
# [Disruptive] tests kill/restart components or nodes in the cluster,
|
# [Disruptive] tests kill/restart components or nodes in the cluster,
|
||||||
# defeating the purpose of a soak cluster. (#15722)
|
# defeating the purpose of a soak cluster. (#15722)
|
||||||
|
|
Loading…
Reference in New Issue