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

Merge pull request #5755 from adisky/gce-configure-use-systemd

Browse Source 
Use systemd cgroup driver for Kubernetes e2e tests with cgroupsv2
This commit is contained in:
Phil Estes 2021-07-19 10:09:38 -04:00 committed by GitHub
commit b88bf1eca7
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
contrib/gce/configure.sh
View File

@ -176,6 +176,8 @@ if [ "${KUBERNETES_MASTER:-}" != "true" ]; then
cni_template_path=""
fi
fi
# Use systemd cgroup if cgroupv2 is enabled
systemdCgroup="${CONTAINERD_CGROUPV2:-"false"}"
log_level="${CONTAINERD_LOG_LEVEL:-"info"}"
max_container_log_line="${CONTAINERD_MAX_CONTAINER_LOG_LINE:-16384}"
cat > ${config_path} <<EOF
@ -204,6 +206,7 @@ disabled_plugins = ["io.containerd.internal.v1.restart"]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc"
SystemdCgroup = ${systemdCgroup}
EOF
chmod 644 "${config_path}"