Merge pull request #399 from fntlnz/lf/cgroup-version

Allow passing cgroup-version to jailer

Author: Kern--

jailer.go

@@ -83,6 +83,9 @@ type JailerConfig struct {
 	// ChrootStrategy will dictate how files are transfered to the root drive.
 	ChrootStrategy HandlersAdapter
 
+	// CgroupVersion is the version of the cgroup filesystem to use.
+	CgroupVersion string
+
 	// Stdout specifies the IO writer for STDOUT to use when spawning the jailer.
 	Stdout io.Writer
 	// Stderr specifies the IO writer for STDERR to use when spawning the jailer.
@@ -106,6 +109,7 @@ type JailerCommandBuilder struct {
 	netNS           string
 	daemonize       bool
 	firecrackerArgs []string
+	cgroupVersion   string
 
 	stdin  io.Reader
 	stdout io.Writer
@@ -140,6 +144,10 @@ func (b JailerCommandBuilder) Args() []string {
 		args = append(args, "--cgroup", fmt.Sprintf("cpuset.cpus=%s", cpulist))
 	}
 
+	if len(b.cgroupVersion) > 0 {
+		args = append(args, "--cgroup-version", b.cgroupVersion)
+	}
+
 	if len(b.chrootBaseDir) > 0 {
 		args = append(args, "--chroot-base-dir", b.chrootBaseDir)
 	}
@@ -271,6 +279,12 @@ func (b JailerCommandBuilder) WithFirecrackerArgs(args ...string) JailerCommandB
 	return b
 }
 
+// WithCgroupVersion specifies which cgroup version to use
+func (b JailerCommandBuilder) WithCgroupVersion(version string) JailerCommandBuilder {
+	b.cgroupVersion = version
+	return b
+}
+
 // Build will build a jailer command.
 func (b JailerCommandBuilder) Build(ctx context.Context) *exec.Cmd {
 	cmd := exec.CommandContext(
@@ -334,6 +348,7 @@ func jail(ctx context.Context, m *Machine, cfg *Config) error {
 		WithExecFile(cfg.JailerCfg.ExecFile).
 		WithChrootBaseDir(cfg.JailerCfg.ChrootBaseDir).
 		WithDaemonize(cfg.JailerCfg.Daemonize).
+		WithCgroupVersion(cfg.JailerCfg.CgroupVersion).
 		WithFirecrackerArgs(fcArgs...).
 		WithStdout(stdout).
 		WithStderr(stderr)

jailer_test.go

@@ -107,6 +107,7 @@ func TestJailerBuilder(t *testing.T) {
 				ExecFile:       "/path/to/firecracker",
 				ChrootBaseDir:  "/tmp",
 				JailerBinary:   "/path/to/the/jailer",
+				CgroupVersion:  "2",
 			},
 			expectedArgs: []string{
 				"/path/to/the/jailer",
@@ -122,6 +123,8 @@ func TestJailerBuilder(t *testing.T) {
 				"cpuset.mems=0",
 				"--cgroup",
 				fmt.Sprintf("cpuset.cpus=%s", getNumaCpuset(0)),
+				"--cgroup-version",
+				"2",
 				"--chroot-base-dir",
 				"/tmp",
 				"--netns",
@@ -143,6 +146,7 @@ func TestJailerBuilder(t *testing.T) {
 				WithUID(IntValue(c.jailerCfg.UID)).
 				WithGID(IntValue(c.jailerCfg.GID)).
 				WithNumaNode(IntValue(c.jailerCfg.NumaNode)).
+				WithCgroupVersion(c.jailerCfg.CgroupVersion).
 				WithExecFile(c.jailerCfg.ExecFile)
 
 			if len(c.jailerCfg.JailerBinary) > 0 {
@@ -265,6 +269,7 @@ func TestJail(t *testing.T) {
 				ExecFile:       "/path/to/firecracker",
 				ChrootBaseDir:  "/tmp",
 				JailerBinary:   "/path/to/the/jailer",
+				CgroupVersion:  "2",
 			},
 			expectedArgs: []string{
 				"/path/to/the/jailer",
@@ -280,6 +285,8 @@ func TestJail(t *testing.T) {
 				"cpuset.mems=0",
 				"--cgroup",
 				fmt.Sprintf("cpuset.cpus=%s", getNumaCpuset(0)),
+				"--cgroup-version",
+				"2",
 				"--chroot-base-dir",
 				"/tmp",
 				"--netns",