From d1ba950abc23839850174c99456632088dd8eb85 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Tue, 17 Apr 2018 17:56:40 -0700
Subject: [PATCH] Add log level support.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 cluster/gce/cloud-init/master.yaml | 2 +-
 cluster/gce/cloud-init/node.yaml   | 2 +-
 cluster/gce/configure.sh           | 6 +++++-
 test/containerd/env                | 1 +
 test/e2e_node/init.yaml            | 2 +-
 test/env                           | 1 +
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cluster/gce/cloud-init/master.yaml b/cluster/gce/cloud-init/master.yaml
index f9e4b538b..e656ea959 100644
--- a/cluster/gce/cloud-init/master.yaml
+++ b/cluster/gce/cloud-init/master.yaml
@@ -46,7 +46,7 @@ write_files:
       LimitNPROC=infinity
       LimitCORE=infinity
       ExecStartPre=/sbin/modprobe overlay
-      ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug
+      ExecStart=/home/containerd/usr/local/bin/containerd
 
       [Install]
       WantedBy=containerd.target
diff --git a/cluster/gce/cloud-init/node.yaml b/cluster/gce/cloud-init/node.yaml
index f850aea2e..7e61f2bc7 100644
--- a/cluster/gce/cloud-init/node.yaml
+++ b/cluster/gce/cloud-init/node.yaml
@@ -46,7 +46,7 @@ write_files:
       LimitNPROC=infinity
       LimitCORE=infinity
       ExecStartPre=/sbin/modprobe overlay
-      ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug
+      ExecStart=/home/containerd/usr/local/bin/containerd
 
       [Install]
       WantedBy=containerd.target
diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh
index b335a7e16..564da10f1 100755
--- a/cluster/gce/configure.sh
+++ b/cluster/gce/configure.sh
@@ -134,7 +134,7 @@ fi
 cp "${CONTAINERD_HOME}/etc/crictl.yaml" /etc
 
 # Generate containerd config
-config_path=${CONTAINERD_CONFIG_PATH:-"/etc/containerd/config.toml"}
+config_path="${CONTAINERD_CONFIG_PATH:-"/etc/containerd/config.toml"}"
 mkdir -p $(dirname ${config_path})
 cni_bin_dir="${CONTAINERD_HOME}/opt/cni/bin"
 cni_template_path="${CONTAINERD_HOME}/opt/containerd/cluster/gce/cni.template"
@@ -145,7 +145,11 @@ if [ -n "${network_policy_provider}" ] && [ "${network_policy_provider}" != "non
   cni_bin_dir="${KUBE_HOME}/bin"
   cni_template_path=""
 fi
+log_level="${CONTAINERD_LOG_LEVEL:-"info"}"
 cat > ${config_path} <<EOF
+[debug]
+  level = "${log_level}"
+
 [plugins.linux]
   shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim"
   runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc"
diff --git a/test/containerd/env b/test/containerd/env
index 4af3ec156..f8b95e79b 100644
--- a/test/containerd/env
+++ b/test/containerd/env
@@ -1,3 +1,4 @@
 CONTAINERD_TEST: 'true'
+CONTAINERD_LOG_LEVEL: 'debug'
 CONTAINERD_DEPLOY_PATH: 'cri-containerd-staging/containerd'
 CONTAINERD_PKG_PREFIX: 'containerd-cni'
diff --git a/test/e2e_node/init.yaml b/test/e2e_node/init.yaml
index c3d2348c1..07a461e00 100644
--- a/test/e2e_node/init.yaml
+++ b/test/e2e_node/init.yaml
@@ -45,7 +45,7 @@ write_files:
       LimitNPROC=infinity
       LimitCORE=infinity
       ExecStartPre=/sbin/modprobe overlay
-      ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug
+      ExecStart=/home/containerd/usr/local/bin/containerd
 
       [Install]
       WantedBy=containerd.target
diff --git a/test/env b/test/env
index 6b85d446b..a642f0e99 100644
--- a/test/env
+++ b/test/env
@@ -1 +1,2 @@
 CONTAINERD_TEST: 'true'
+CONTAINERD_LOG_LEVEL: 'debug'