Add log level support.

Signed-off-by: Lantao Liu <[email protected]>

Author: Random-Liu

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

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

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"

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'

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

test/env

@@ -1 +1,2 @@
 CONTAINERD_TEST: 'true'
+CONTAINERD_LOG_LEVEL: 'debug'