cmd: generate: remove old namespace flags

--uts, --user and the other flags are not properly namespaced or
extensible, so remove them in favour of the new --linux-namespace-*
family of flags.

Signed-off-by: Aleksa Sarai <asarai@suse.de>

Author: cyphar

cmd/oci-runtime-tool/generate.go

@@ -24,7 +24,6 @@ var generateFlags = []cli.Flag{
 	cli.StringSliceFlag{Name: "bind", Usage: "bind mount directories src:dest[:options...]"},
 	cli.StringSliceFlag{Name: "cap-add", Usage: "add Linux capabilities"},
 	cli.StringSliceFlag{Name: "cap-drop", Usage: "drop Linux capabilities"},
-	cli.StringFlag{Name: "cgroup", Usage: "cgroup namespace"},
 	cli.StringFlag{Name: "cgroups-path", Usage: "specify the path to the cgroups"},
 	cli.StringFlag{Name: "cwd", Value: "/", Usage: "current working directory for the process"},
 	cli.BoolFlag{Name: "disable-oom-kill", Usage: "disable OOM Killer"},
@@ -34,7 +33,6 @@ var generateFlags = []cli.Flag{
 	cli.StringSliceFlag{Name: "gidmappings", Usage: "add GIDMappings e.g HostID:ContainerID:Size"},
 	cli.StringSliceFlag{Name: "groups", Usage: "supplementary groups for the process"},
 	cli.StringFlag{Name: "hostname", Usage: "hostname value for the container"},
-	cli.StringFlag{Name: "ipc", Usage: "ipc namespace"},
 	cli.StringSliceFlag{Name: "label", Usage: "add annotations to the configuration e.g. key=value"},
 	cli.Uint64Flag{Name: "linux-cpu-shares", Usage: "the relative share of CPU time available to the tasks in a cgroup"},
 	cli.Uint64Flag{Name: "linux-cpu-period", Usage: "the CPU period to be used for hardcapping (in usecs)"},
@@ -56,15 +54,12 @@ var generateFlags = []cli.Flag{
 	cli.Uint64Flag{Name: "linux-realtime-period", Usage: "CPU period to be used for realtime scheduling (in usecs)"},
 	cli.Uint64Flag{Name: "linux-realtime-runtime", Usage: "the time realtime scheduling may use (in usecs)"},
 	cli.StringSliceFlag{Name: "masked-paths", Usage: "specifies paths can not be read inside container"},
-	cli.StringFlag{Name: "mount", Usage: "mount namespace"},
 	cli.StringFlag{Name: "mount-cgroups", Value: "no", Usage: "mount cgroups (rw,ro,no)"},
 	cli.StringFlag{Name: "mount-label", Usage: "selinux mount context label"},
-	cli.StringFlag{Name: "network", Usage: "network namespace"},
 	cli.BoolFlag{Name: "no-new-privileges", Usage: "set no new privileges bit for the container process"},
 	cli.IntFlag{Name: "oom-score-adj", Usage: "oom_score_adj for the container"},
 	cli.StringFlag{Name: "os", Value: runtime.GOOS, Usage: "operating system the container is created for"},
 	cli.StringFlag{Name: "output", Usage: "output file (defaults to stdout)"},
-	cli.StringFlag{Name: "pid", Usage: "pid namespace"},
 	cli.StringSliceFlag{Name: "poststart", Usage: "set command to run in poststart hooks"},
 	cli.StringSliceFlag{Name: "poststop", Usage: "set command to run in poststop hooks"},
 	cli.StringSliceFlag{Name: "prestart", Usage: "set command to run in prestart hooks"},
@@ -94,8 +89,6 @@ var generateFlags = []cli.Flag{
 	cli.BoolFlag{Name: "tty", Usage: "allocate a new tty for the container process"},
 	cli.IntFlag{Name: "uid", Usage: "uid for the process"},
 	cli.StringSliceFlag{Name: "uidmappings", Usage: "add UIDMappings e.g HostID:ContainerID:Size"},
-	cli.StringFlag{Name: "user", Usage: "user namespace"},
-	cli.StringFlag{Name: "uts", Usage: "uts namespace"},
 }
 
 var generateCommand = cli.Command{
@@ -287,8 +280,6 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		}
 	}
 
-	needsNewUser := false
-
 	var uidMaps, gidMaps []string
 
 	if context.IsSet("uidmappings") {
@@ -299,12 +290,11 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		gidMaps = context.StringSlice("gidmappings")
 	}
 
+	// Add default user namespace.
 	if len(uidMaps) > 0 || len(gidMaps) > 0 {
-		needsNewUser = true
+		g.AddOrReplaceLinuxNamespace("user", "")
 	}
 
-	setupLinuxNamespaces(context, g, needsNewUser)
-
 	if context.IsSet("tmpfs") {
 		tmpfsSlice := context.StringSlice("tmpfs")
 		for _, s := range tmpfsSlice {
@@ -519,20 +509,6 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 	return err
 }
 
-func setupLinuxNamespaces(context *cli.Context, g *generate.Generator, needsNewUser bool) {
-	for _, nsName := range generate.Namespaces {
-		if !context.IsSet(nsName) && !(needsNewUser && nsName == "user") {
-			continue
-		}
-		nsPath := context.String(nsName)
-		if nsPath == "host" {
-			g.RemoveLinuxNamespace(nsName)
-			continue
-		}
-		g.AddOrReplaceLinuxNamespace(nsName, nsPath)
-	}
-}
-
 func parseIDMapping(idms string) (uint32, uint32, uint32, error) {
 	idm := strings.Split(idms, ":")
 	if len(idm) != 3 {