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

Merge pull request #824 from Random-Liu/make-max-log-size-configurable

Browse Source 
Make max container log line size configurable through cloud init.
This commit is contained in:
Lantao Liu 2018-06-20 10:30:18 -07:00 committed by GitHub
commit cfa88fca32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/configure.sh
View File

@ -154,6 +154,7 @@ if [ -n "${network_policy_provider}" ] && [ "${network_policy_provider}" != "non
cni_template_path="" cni_template_path=""
fi fi
log_level="${CONTAINERD_LOG_LEVEL:-"info"}" log_level="${CONTAINERD_LOG_LEVEL:-"info"}"
max_container_log_line="${CONTAINERD_MAX_CONTAINER_LOG_LINE:-16384}"
cat > ${config_path} <<EOF cat > ${config_path} <<EOF
# Kubernetes doesn't use containerd restart manager. # Kubernetes doesn't use containerd restart manager.
disabled_plugins = ["restart"] disabled_plugins = ["restart"]
@ -165,6 +166,8 @@ disabled_plugins = ["restart"]
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"
[plugins.cri]
max_container_log_line_size = ${max_container_log_line}
[plugins.cri.cni] [plugins.cri.cni]
bin_dir = "${cni_bin_dir}" bin_dir = "${cni_bin_dir}"
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"