github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add log level support.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-04-17 17:56:40 -07:00
parent 72ade6c4f5
commit d1ba950abc
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/cloud-init/master.yaml
View File

@ -46,7 +46,7 @@ write_files:
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
ExecStartPre=/sbin/modprobe overlay ExecStartPre=/sbin/modprobe overlay
ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug ExecStart=/home/containerd/usr/local/bin/containerd
[Install] [Install]
WantedBy=containerd.target WantedBy=containerd.target

2
cluster/gce/cloud-init/node.yaml
View File

@ -46,7 +46,7 @@ write_files:
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
ExecStartPre=/sbin/modprobe overlay ExecStartPre=/sbin/modprobe overlay
ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug ExecStart=/home/containerd/usr/local/bin/containerd
[Install] [Install]
WantedBy=containerd.target WantedBy=containerd.target

6
cluster/gce/configure.sh
View File

@ -134,7 +134,7 @@ fi
cp "${CONTAINERD_HOME}/etc/crictl.yaml" /etc cp "${CONTAINERD_HOME}/etc/crictl.yaml" /etc
# Generate containerd config # 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}) mkdir -p $(dirname ${config_path})
cni_bin_dir="${CONTAINERD_HOME}/opt/cni/bin" cni_bin_dir="${CONTAINERD_HOME}/opt/cni/bin"
cni_template_path="${CONTAINERD_HOME}/opt/containerd/cluster/gce/cni.template" 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_bin_dir="${KUBE_HOME}/bin"
cni_template_path="" cni_template_path=""
fi fi
log_level="${CONTAINERD_LOG_LEVEL:-"info"}"
cat > ${config_path} <<EOF cat > ${config_path} <<EOF
[debug]
level = "${log_level}"
[plugins.linux] [plugins.linux]
shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim" shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim"
runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc" runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc"

1
test/containerd/env
View File

@ -1,3 +1,4 @@
CONTAINERD_TEST: 'true' CONTAINERD_TEST: 'true'
CONTAINERD_LOG_LEVEL: 'debug'
CONTAINERD_DEPLOY_PATH: 'cri-containerd-staging/containerd' CONTAINERD_DEPLOY_PATH: 'cri-containerd-staging/containerd'
CONTAINERD_PKG_PREFIX: 'containerd-cni' CONTAINERD_PKG_PREFIX: 'containerd-cni'

2
test/e2e_node/init.yaml
View File

@ -45,7 +45,7 @@ write_files:
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
ExecStartPre=/sbin/modprobe overlay ExecStartPre=/sbin/modprobe overlay
ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug ExecStart=/home/containerd/usr/local/bin/containerd
[Install] [Install]
WantedBy=containerd.target WantedBy=containerd.target

1
test/env
View File

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