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

estesp · web-flow · commit b88bf1eca7a7 · 2021-07-19T10:09:38.000-04:00
Use systemd cgroup driver for Kubernetes e2e tests with cgroupsv2
diff --git a/contrib/gce/configure.sh b/contrib/gce/configure.sh
@@ -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}"
 
