From 9b253ab347a37d71cffec1f6c5b3a2f433a62513 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 24 Apr 2026 13:24:27 -0400 Subject: [PATCH] Update stale comments referencing slirp4netns Replace remaining references to Slirp/slirp4netns in code comments with Pasta or remove them where the reference is no longer relevant. Signed-off-by: Lokesh Mandvekar --- libpod/container.go | 4 ++-- pkg/domain/infra/abi/play.go | 2 +- pkg/specgen/podspecgen.go | 4 ++-- pkg/specgen/specgen.go | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libpod/container.go b/libpod/container.go index 8b7653780c..b7e24bf8d0 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -1445,7 +1445,7 @@ func (c *Container) NetworkMode() string { switch { case c.config.CreateNetNS: // We actually store the network - // mode for Slirp and Bridge, so + // mode for Pasta and Bridge, so // we can just use that networkMode = string(c.config.NetMode) case c.config.NetNsCtr != "": @@ -1463,7 +1463,7 @@ func (c *Container) NetworkMode() string { networkMode = fmt.Sprintf("ns:%s", ns.Path) } else { // We're making a network ns, but not - // configuring with Slirp. That means + // configuring networking. That means // it's --net=none networkMode = "none" } diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 3a4d1bd90f..2363eceac4 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -78,7 +78,7 @@ func (ic *ContainerEngine) createServiceContainer(ctx context.Context, name stri MemorySwappiness: -1, ReadOnly: true, ReadWriteTmpFS: false, - // No need to spin up slirp etc. + // No need to set up networking. Net: &entities.NetOptions{Network: specgen.Namespace{NSMode: specgen.NoNetwork}}, StopTimeout: rtc.Engine.StopTimeout, HealthLogDestination: define.DefaultHealthCheckLocalDestination, diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index ca2bc4aed9..6c850fe6a7 100644 --- a/pkg/specgen/podspecgen.go +++ b/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. diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 5b44e0d65c..539445739b 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -485,14 +485,14 @@ type ContainerNetworkConfig struct { // Mandatory. NetNS Namespace `json:"netns"` // PortBindings is a set of ports to map into the container. - // Only available if NetNS is set to bridge, slirp, or pasta. + // Only available if NetNS is set to bridge or pasta. // Optional. PortMappings []nettypes.PortMapping `json:"portmappings,omitempty"` // PublishExposedPorts will publish ports specified in the image to // random unused ports (guaranteed to be above 1024) on the host. // This is based on ports set in Expose below, and any ports specified // by the Image (if one is given). - // Only available if NetNS is set to Bridge or Slirp. + // Only available if NetNS is set to Bridge or Pasta. // Optional. PublishExposedPorts *bool `json:"publish_image_ports,omitempty"` // Expose is a number of ports that will be forwarded to the container @@ -501,7 +501,7 @@ type ContainerNetworkConfig struct { // protocol i.e map[uint16]string. Allowed protocols are "tcp", "udp", and "sctp", or some // combination of the three separated by commas. // If protocol is set to "" we will assume TCP. - // Only available if NetNS is set to Bridge or Slirp, and + // Only available if NetNS is set to Bridge or Pasta, and // PublishExposedPorts is set. // Optional. Expose map[uint16]string `json:"expose,omitempty"`