remove --mount-cgroups option

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>

Author: Ma Shimiao

cmd/oci-runtime-tool/generate.go

@@ -80,7 +80,6 @@ var generateFlags = []cli.Flag{
 	cli.StringFlag{Name: "linux-selinux-label", Usage: "process selinux label"},
 	cli.StringSliceFlag{Name: "linux-sysctl", Usage: "add sysctl settings e.g net.ipv4.forward=1"},
 	cli.StringSliceFlag{Name: "linux-uidmappings", Usage: "add UIDMappings e.g HostID:ContainerID:Size"},
-	cli.StringFlag{Name: "mount-cgroups", Value: "no", Usage: "mount cgroups (rw,ro,no)"},
 	cli.StringSliceFlag{Name: "mounts-add", Usage: "configures additional mounts inside container"},
 	cli.BoolFlag{Name: "mounts-remove-all", Usage: "remove all mounts inside container"},
 	cli.StringFlag{Name: "output", Usage: "output file (defaults to stdout)"},
@@ -415,11 +414,6 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		g.AddOrReplaceLinuxNamespace("user", "")
 	}
 
-	mountCgroupOption := context.String("mount-cgroups")
-	if err := g.AddCgroupsMount(mountCgroupOption); err != nil {
-		return err
-	}
-
 	if context.IsSet("mounts-remove-all") {
 		g.ClearMounts()
 	}

completions/bash/oci-runtime-tool

@@ -360,7 +360,6 @@ _oci-runtime-tool_generate() {
 		--linux-selinux-label
 		--linux-sysctl
 		--linux-uidmappings
-		--mount-cgroups
 		--mounts-add
 		--output
 		--process-cap-add-ambient
@@ -436,11 +435,6 @@ _oci-runtime-tool_generate() {
 			return
 			;;
 
-		--mount-cgroups)
-			COMPREPLY=( $( compgen -W "no ro rw" -- "$cur" ) )
-			return
-			;;
-
 		--process-cap-add-ambient|--process-cap-add-bounding|--process-cap-add-effective|--process-cap-add-inheritable|--process-cap-add-permitted|--process-cap-drop-ambient|--process-cap-drop-bounding|--process-cap-drop-effective|--process-cap-drop-inheritable|--process-cap-drop-permitted)
 			__oci-runtime-tool_complete_capabilities
 			return

generate/generate.go

@@ -896,29 +896,6 @@ func (g *Generator) ClearMounts() {
 	g.spec.Mounts = []rspec.Mount{}
 }
 
-// AddCgroupsMount adds a cgroup mount into g.spec.Mounts.
-func (g *Generator) AddCgroupsMount(mountCgroupOption string) error {
-	switch mountCgroupOption {
-	case "ro":
-	case "rw":
-	case "no":
-		return nil
-	default:
-		return fmt.Errorf("--mount-cgroups should be one of (ro,rw,no)")
-	}
-
-	mnt := rspec.Mount{
-		Destination: "/sys/fs/cgroup",
-		Type:        "cgroup",
-		Source:      "cgroup",
-		Options:     []string{"nosuid", "noexec", "nodev", "relatime", mountCgroupOption},
-	}
-	g.initSpec()
-	g.spec.Mounts = append(g.spec.Mounts, mnt)
-
-	return nil
-}
-
 // SetupPrivileged sets up the privilege-related fields inside g.spec.
 func (g *Generator) SetupPrivileged(privileged bool) {
 	if privileged { // Add all capabilities in privileged mode.

man/oci-runtime-tool-generate.1.md

@@ -283,9 +283,6 @@ read the configuration from `config.json`.
 
   Add UIDMappings e.g HostUID:ContainerID:Size.  Implies **--user=**.
 
-**--mount-cgroups**=[rw|ro|no]
-  Mount cgroups. The default is *no*.
-
 **--mounts-add**=[]
   Configures additional mounts inside container.
   This option can be specified multiple times.