From 150e07b648e7766ca862ee868bf99544d0836e89 Mon Sep 17 00:00:00 2001
From: Aditi Sharma <adi.sky17@gmail.com>
Date: Mon, 19 Jul 2021 14:53:47 +0530
Subject: [PATCH] Use systemd cgroup driver for cgroupv2 tests

Set systemdCgroup for cgroupv2 Kuberentes e2e tests

Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
---
 contrib/gce/configure.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/gce/configure.sh b/contrib/gce/configure.sh
index 741684edc..e90a8fae4 100755
--- 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}"