pkg/specgen/: Remove slirp

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

pkg/specgen/generate/container.go

@@ -443,21 +443,6 @@ func ConfigToSpec(rt *libpod.Runtime, specg *specgen.SpecGenerator, containerID
 					specg.Expose = toExpose
 					specg.PortMappings = conf.PortMappings
 					specg.NetNS = specgen.Namespace{NSMode: specgen.Bridge}
-				case conf.NetMode.IsSlirp4netns():
-					toExpose := make(map[uint16]string, len(conf.ExposedPorts))
-					for _, expose := range []map[uint16][]string{conf.ExposedPorts} {
-						for port, proto := range expose {
-							toExpose[port] = strings.Join(proto, ",")
-						}
-					}
-					specg.Expose = toExpose
-					specg.PortMappings = conf.PortMappings
-					netMode := strings.Split(string(conf.NetMode), ":")
-					var val string
-					if len(netMode) > 1 {
-						val = netMode[1]
-					}
-					specg.NetNS = specgen.Namespace{NSMode: specgen.Slirp, Value: val}
 				case conf.NetMode.IsPrivate():
 					specg.NetNS = specgen.Namespace{NSMode: specgen.Private}
 				case conf.NetMode.IsDefault():
@@ -631,7 +616,7 @@ func CheckName(rt *libpod.Runtime, n string, kind bool) string {
 // Note: Update `podman run --publish | -p` docs when modifying this function.
 func isPortMappingCompatibleNetNSMode(nsMode specgen.NamespaceMode) bool {
 	switch nsMode {
-	case specgen.Bridge, specgen.Slirp, specgen.Pasta:
+	case specgen.Bridge, specgen.Pasta:
 		return true
 	default:
 		return false

pkg/specgen/generate/container_create.go

@@ -23,7 +23,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"go.podman.io/common/libimage"
 	"go.podman.io/common/libnetwork/pasta"
-	"go.podman.io/common/libnetwork/slirp4netns"
 	"tags.cncf.io/container-device-interface/pkg/parser"
 )
 
@@ -203,9 +202,7 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
 				return nil, nil, nil, err
 			}
 			switch conf.Network.DefaultRootlessNetworkCmd {
-			case slirp4netns.BinaryName, "":
-				s.NetNS.NSMode = specgen.Slirp
-			case pasta.BinaryName:
+			case pasta.BinaryName, "":
 				s.NetNS.NSMode = specgen.Pasta
 			default:
 				return nil, nil, nil, fmt.Errorf("invalid default_rootless_network_cmd option %q",

pkg/specgen/generate/namespaces.go

@@ -322,12 +322,6 @@ func namespaceOptions(s *specgen.SpecGenerator, rt *libpod.Runtime, pod *libpod.
 		} else {
 			toReturn = append(toReturn, libpod.WithNetNSFrom(netCtr))
 		}
-	case specgen.Slirp:
-		val := "slirp4netns"
-		if s.NetNS.Value != "" {
-			val = fmt.Sprintf("slirp4netns:%s", s.NetNS.Value)
-		}
-		toReturn = append(toReturn, libpod.WithNetNS(portMappings, postConfigureNetNS, val, nil))
 	case specgen.Pasta:
 		val := "pasta"
 		toReturn = append(toReturn, libpod.WithNetNS(portMappings, postConfigureNetNS, val, nil))

pkg/specgen/generate/oci_linux.go

@@ -50,7 +50,7 @@ func canMountSys(isRootless, isNewUserns bool, s *specgen.SpecGenerator) bool {
 	}
 	if isNewUserns {
 		switch s.NetNS.NSMode {
-		case specgen.Slirp, specgen.Pasta, specgen.Private, specgen.NoNetwork, specgen.Bridge:
+		case specgen.Pasta, specgen.Private, specgen.NoNetwork, specgen.Bridge:
 			return true
 		default:
 			return false

pkg/specgen/generate/pod_create.go

@@ -203,12 +203,6 @@ func MapSpec(p *specgen.PodSpecGenerator) (*specgen.SpecGenerator, error) {
 			return nil, fmt.Errorf("cannot set host network if network-related configuration is specified: %w", define.ErrInvalidArg)
 		}
 		spec.NetNS.NSMode = specgen.Host
-	case specgen.Slirp:
-		logrus.Debugf("Pod will use slirp4netns")
-		if spec.NetNS.NSMode != specgen.Host {
-			spec.NetworkOptions = p.NetworkOptions
-			spec.NetNS.NSMode = specgen.Slirp
-		}
 	case specgen.Pasta:
 		logrus.Debugf("Pod will use pasta")
 		if spec.NetNS.NSMode != specgen.Host {

pkg/specgen/generate/pod_create_test.go

@@ -132,23 +132,6 @@ func TestMapSpecNetworkOptions(t *testing.T) {
 			podSpec:   createPodSpecWithNetworks(specgen.Host),
 			mustError: true,
 		},
-		{
-			name:           "Slirp",
-			podSpec:        createPodSpec(specgen.Slirp),
-			expectedNSMode: specgen.Slirp,
-		},
-		{
-			name: "Slirp but if infra spec NS mode is Host",
-			podSpec: specgen.PodSpecGenerator{
-				InfraContainerSpec: &specgen.SpecGenerator{
-					ContainerNetworkConfig: specgen.ContainerNetworkConfig{NetNS: specgen.Namespace{NSMode: host}},
-				},
-				PodNetworkConfig: specgen.PodNetworkConfig{
-					NetNS: specgen.Namespace{NSMode: specgen.Slirp},
-				},
-			},
-			expectedNSMode: specgen.Host,
-		},
 		{
 			name:            "Path",
 			podSpec:         createPodSpecWithNetNsPath("/var/run/netns/bla"),

pkg/specgen/namespaces.go

@@ -49,10 +49,6 @@ const (
 	// should be used.
 	// Only used with the network namespace, invalid otherwise.
 	Bridge NamespaceMode = "bridge"
-	// Slirp indicates that a slirp4netns network stack should
-	// be used.
-	// Only used with the network namespace, invalid otherwise.
-	Slirp NamespaceMode = "slirp4netns"
 	// Pasta indicates that a pasta network stack should be used.
 	// Only used with the network namespace, invalid otherwise.
 	Pasta NamespaceMode = "pasta"
@@ -158,8 +154,6 @@ func validateNetNS(n *Namespace) error {
 		return nil
 	}
 	switch n.NSMode {
-	case Slirp:
-		break
 	case Pasta:
 		// Check if we run rootless/in a userns. Do not use rootless.IsRootless() here.
 		// Pasta switches to nobody when running as root which causes it to fail while
@@ -181,7 +175,7 @@ func validateNetNS(n *Namespace) error {
 		if len(n.Value) < 1 {
 			return fmt.Errorf("namespace mode %s requires a value", n.NSMode)
 		}
-	} else if n.NSMode != Slirp {
+	} else {
 		// All others except must NOT set a string value
 		if len(n.Value) > 0 {
 			return fmt.Errorf("namespace value %s cannot be provided with namespace mode %s", n.Value, n.NSMode)
@@ -211,7 +205,7 @@ func (n *Namespace) validate() error {
 	switch n.NSMode {
 	case "", Default, Host, Path, FromContainer, FromPod, Private:
 		// Valid, do nothing
-	case NoNetwork, Bridge, Slirp, Pasta:
+	case NoNetwork, Bridge, Pasta:
 		return errors.New("cannot use network modes with non-network namespace")
 	default:
 		return fmt.Errorf("invalid namespace type %s specified", n.NSMode)
@@ -337,13 +331,6 @@ func ParseNetworkFlag(networks []string) (Namespace, map[string]types.PerNetwork
 	podmanNetworks := make(map[string]types.PerNetworkOptions)
 
 	switch {
-	case ns == string(Slirp), strings.HasPrefix(ns, string(Slirp)+":"):
-		key, options, hasOptions := strings.Cut(ns, ":")
-		if hasOptions {
-			networkOptions = make(map[string][]string)
-			networkOptions[key] = strings.Split(options, ",")
-		}
-		toReturn.NSMode = Slirp
 	case ns == string(FromPod):
 		toReturn.NSMode = FromPod
 	case ns == "" || ns == string(Default) || ns == string(Private):
@@ -416,7 +403,7 @@ func ParseNetworkFlag(networks []string) (Namespace, map[string]types.PerNetwork
 				return toReturn, nil, nil, fmt.Errorf("network name cannot be empty: %w", define.ErrInvalidArg)
 			}
 			if slices.Contains([]string{
-				string(Bridge), string(Slirp), string(Pasta), string(FromPod), string(NoNetwork),
+				string(Bridge), string(Pasta), string(FromPod), string(NoNetwork),
 				string(Default), string(Private), string(Path), string(FromContainer), string(Host),
 			}, name) {
 				return toReturn, nil, nil, fmt.Errorf("can only set extra network names, selected mode %s conflicts with bridge: %w", name, define.ErrInvalidArg)

pkg/specgen/namespaces_test.go

@@ -57,12 +57,6 @@ func TestParseNetworkFlag(t *testing.T) {
 				defaultNetName: {},
 			},
 		},
-		{
-			name:     "slirp4netns mode",
-			args:     []string{"slirp4netns"},
-			nsmode:   Namespace{NSMode: Slirp},
-			networks: map[string]types.PerNetworkOptions{},
-		},
 		{
 			name:     "from pod mode",
 			args:     []string{"pod"},
@@ -87,15 +81,6 @@ func TestParseNetworkFlag(t *testing.T) {
 			nsmode:   Namespace{NSMode: Path, Value: "/path"},
 			networks: map[string]types.PerNetworkOptions{},
 		},
-		{
-			name:     "slirp4netns mode with options",
-			args:     []string{"slirp4netns:cidr=10.0.0.0/24"},
-			nsmode:   Namespace{NSMode: Slirp},
-			networks: map[string]types.PerNetworkOptions{},
-			options: map[string][]string{
-				"slirp4netns": {"cidr=10.0.0.0/24"},
-			},
-		},
 		{
 			name:   "bridge mode with options 1",
 			args:   []string{"bridge:ip=10.0.0.1,mac=11:22:33:44:55:66"},

pkg/specgen/pod_validate.go

@@ -64,9 +64,9 @@ func (p *PodSpecGenerator) Validate() error {
 			return exclusivePodOptions("NoInfra", "NoManageResolvConf")
 		}
 	}
-	if p.NetNS.NSMode != "" && p.NetNS.NSMode != Bridge && p.NetNS.NSMode != Slirp && p.NetNS.NSMode != Pasta && p.NetNS.NSMode != Default {
+	if p.NetNS.NSMode != "" && p.NetNS.NSMode != Bridge && p.NetNS.NSMode != Pasta && p.NetNS.NSMode != Default {
 		if len(p.PortMappings) > 0 {
-			return errors.New("PortMappings can only be used with Bridge, slirp4netns, or pasta networking")
+			return errors.New("PortMappings can only be used with Bridge, or pasta networking")
 		}
 	}
 

pkg/specgen/podspecgen.go

@@ -106,13 +106,13 @@ type PodNetworkConfig struct {
 	// containers in the pod.
 	// Cannot be set to FromContainer and FromPod.
 	// Setting this to anything except default conflicts with NoInfra=true.
-	// Defaults to Bridge as root and Slirp as rootless.
+	// Defaults to Bridge as root and Pasta as rootless.
 	// Mandatory.
 	NetNS Namespace `json:"netns"`
 	// PortMappings is a set of ports to map into the infra container.
 	// As, by default, containers share their network with the infra
 	// container, this will forward the ports to the entire pod.
-	// Only available if NetNS is set to Bridge, Slirp, or Pasta.
+	// Only available if NetNS is set to Bridge, or Pasta.
 	// Optional.
 	PortMappings []types.PortMapping `json:"portmappings,omitempty"`
 	// Map of networks names to ids the container should join to.