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

Merge pull request #5884 from adisky/add-systemd-env

Browse Source 
Make Cgroup driver configurable in gce configure script
This commit is contained in:
Derek McGowan 2021-08-17 09:40:05 -07:00 committed by GitHub
commit c076ede405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/gce/configure.sh
View File

@ -176,8 +176,8 @@ if [ "${KUBERNETES_MASTER:-}" != "true" ]; then
cni_template_path="" cni_template_path=""
fi fi
fi fi
# Use systemd cgroup if cgroupv2 is enabled # Use systemd cgroup if specified in env
systemdCgroup="${CONTAINERD_CGROUPV2:-"false"}" systemdCgroup="${CONTAINERD_SYSTEMD_CGROUP:-"false"}"
log_level="${CONTAINERD_LOG_LEVEL:-"info"}" log_level="${CONTAINERD_LOG_LEVEL:-"info"}"
max_container_log_line="${CONTAINERD_MAX_CONTAINER_LOG_LINE:-16384}" max_container_log_line="${CONTAINERD_MAX_CONTAINER_LOG_LINE:-16384}"
cat > ${config_path} <<EOF cat > ${config_path} <<EOF