mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-05-24 08:26:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove slirp4netns from CLI and completions

Browse Source 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
Lokesh Mandvekar
2025-12-25 16:00:59 -05:00
parent cefb944647
commit 42a98a5a82
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/podman/common/completion.go
View File

@@ -1329,26 +1329,10 @@ func AutocompleteNetworkFlag(cmd *cobra.Command, _ []string, toComplete string)
"none": nil,
"host": nil,
"private": nil,
"slirp4netns:": func(s string) ([]string, cobra.ShellCompDirective) {
skv := keyValueCompletion{
"allow_host_loopback=": getBoolCompletion,
"cidr=": nil,
"enable_ipv6=": getBoolCompletion,
"mtu=": nil,
"outbound_addr=": nil,
"outbound_addr6=": nil,
"port_handler=": func(_ string) ([]string, cobra.ShellCompDirective) {
return []string{"rootlesskit", "slirp4netns"}, cobra.ShellCompDirectiveNoFileComp
},
}
return completeKeyValues(s, skv)
},
}
networks, _ := getNetworks(cmd, toComplete, completeDefault)
suggestions, dir := completeKeyValues(toComplete, kv)
// add slirp4netns here it does not work correct if we add it to the kv map
suggestions = append(suggestions, "slirp4netns")
return append(networks, suggestions...), dir
}

2
cmd/podman/system/service_abi_common.go
View File

@@ -2,7 +2,7 @@
package system
// Currently, we only need servicereaper on Linux to support slirp4netns.
// Currently, we only need servicereaper on Linux for rootless networking.
func maybeStartServiceReaper() {
}

2
cmd/podman/system/service_abi_linux.go
View File

@@ -8,7 +8,7 @@ import (
"go.podman.io/common/pkg/servicereaper"
)
// Currently, we only need servicereaper on Linux to support slirp4netns.
// Currently, we only need servicereaper on Linux for rootless networking.
func maybeStartServiceReaper() {
servicereaper.Start()
}

3
pkg/domain/infra/abi/network.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/containers/podman/v6/libpod/events"
"github.com/containers/podman/v6/pkg/domain/entities"
"go.podman.io/common/libnetwork/pasta"
"go.podman.io/common/libnetwork/slirp4netns"
"go.podman.io/common/libnetwork/types"
netutil "go.podman.io/common/libnetwork/util"
)
@@ -180,7 +179,7 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
}
func (ic *ContainerEngine) NetworkCreate(_ context.Context, network types.Network, createOptions *types.NetworkCreateOptions) (*types.Network, error) {
if slices.Contains([]string{"none", "host", "bridge", "private", slirp4netns.BinaryName, pasta.BinaryName, "container", "ns", "default"}, network.Name) {
if slices.Contains([]string{"none", "host", "bridge", "private", "slirp4netns", pasta.BinaryName, "container", "ns", "default"}, network.Name) {
return nil, fmt.Errorf("cannot create network with name %q because it conflicts with a valid network mode", network.Name)
}
network, err := ic.Libpod.Network().NetworkCreate(network, createOptions)