From 93e14a63e80e67d8462f0179ad6ae428a353dba0 Mon Sep 17 00:00:00 2001
From: Jeff Lowdermilk <jeffml@google.com>
Date: Thu, 3 Mar 2016 19:21:11 -0800
Subject: [PATCH] =?UTF-8?q?Revert=20"Enable=20--log-level=3Dinfo=20for=20d?=
 =?UTF-8?q?ocker=20daemons=20for=20scalability=20jenkins=20jo=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cluster/common.sh                            | 5 -----
 cluster/gce/config-test.sh                   | 1 -
 cluster/gce/configure-vm.sh                  | 5 -----
 cluster/saltbase/salt/docker/docker-defaults | 6 +-----
 hack/jenkins/job-configs/kubernetes-e2e.yaml | 2 --
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/cluster/common.sh b/cluster/common.sh
index 5196faf59c..80aef9a6a8 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -528,11 +528,6 @@ EOF
   if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
       cat >>$file <<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
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 92c504c63a..3a8d42b55b 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -69,7 +69,6 @@ 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}"
diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh
index 7eb6620f96..f7724a04c8 100755
--- a/cluster/gce/configure-vm.sh
+++ b/cluster/gce/configure-vm.sh
@@ -464,11 +464,6 @@ EOF
     if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
       cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
 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
diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
index c68534bd62..5b97c16d6a 100644
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -7,9 +7,5 @@
 {% if pillar.get('network_provider', '').lower() == 'kubenet' %}
   {% set bridge_opts = "" %}
 {% endif -%}
-{% 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_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn"
 DOCKER_NOFILE=1000000
diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml
index e90e77bea6..ba4e9b2091 100644
--- a/hack/jenkins/job-configs/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml
@@ -146,8 +146,6 @@
                 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