opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

use netns package from c/common

Browse Source 
The netns package was moved to c/common so we should use this and remove
the package from podman.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-01-07 14:34:45 +01:00
parent 0151e10b62
commit 918890a4d6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/networking_linux.go
View File

@ -20,11 +20,11 @@ import (
"github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/ns"
"github.com/containers/common/libnetwork/types" "github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/netns"
"github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/libpod/events" "github.com/containers/podman/v3/libpod/events"
"github.com/containers/podman/v3/pkg/errorhandling" "github.com/containers/podman/v3/pkg/errorhandling"
"github.com/containers/podman/v3/pkg/namespaces" "github.com/containers/podman/v3/pkg/namespaces"
"github.com/containers/podman/v3/pkg/netns"
"github.com/containers/podman/v3/pkg/resolvconf" "github.com/containers/podman/v3/pkg/resolvconf"
"github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/rootless"
"github.com/containers/podman/v3/pkg/util" "github.com/containers/podman/v3/pkg/util"

14
pkg/netns/netns_linux.go → vendor/github.com/containers/common/pkg/netns/netns_linux.go generated vendored
View File

@ -29,8 +29,8 @@ import (
"sync" "sync"
"github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/ns"
"github.com/containers/podman/v3/pkg/rootless" "github.com/containers/common/pkg/util"
"github.com/containers/podman/v3/pkg/util" "github.com/containers/storage/pkg/unshare"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -38,7 +38,7 @@ import (
// GetNSRunDir returns the dir of where to create the netNS. When running // GetNSRunDir returns the dir of where to create the netNS. When running
// rootless, it needs to be at a location writable by user. // rootless, it needs to be at a location writable by user.
func GetNSRunDir() (string, error) { func GetNSRunDir() (string, error) {
if rootless.IsRootless() { if unshare.IsRootless() {
rootlessDir, err := util.GetRuntimeDir() rootlessDir, err := util.GetRuntimeDir()
if err != nil { if err != nil {
return "", err return "", err
@ -56,7 +56,7 @@ func NewNS() (ns.NetNS, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to generate random netns name: %v", err) return nil, fmt.Errorf("failed to generate random netns name: %v", err)
} }
nsName := fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:]) nsName := fmt.Sprintf("netns-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
return NewNSWithName(nsName) return NewNSWithName(nsName)
} }
@ -152,7 +152,7 @@ func NewNSWithName(name string) (ns.NetNS, error) {
// Put this thread back to the orig ns, since it might get reused (pre go1.10) // Put this thread back to the orig ns, since it might get reused (pre go1.10)
defer func() { defer func() {
if err := origNS.Set(); err != nil { if err := origNS.Set(); err != nil {
if rootless.IsRootless() && strings.Contains(err.Error(), "operation not permitted") { if unshare.IsRootless() && strings.Contains(err.Error(), "operation not permitted") {
// When running in rootless mode it will fail to re-join // When running in rootless mode it will fail to re-join
// the network namespace owned by root on the host. // the network namespace owned by root on the host.
return return
@ -180,13 +180,13 @@ func NewNSWithName(name string) (ns.NetNS, error) {
} }
// UnmountNS unmounts the NS held by the netns object // UnmountNS unmounts the NS held by the netns object
func UnmountNS(ns ns.NetNS) error { func UnmountNS(netns ns.NetNS) error {
nsRunDir, err := GetNSRunDir() nsRunDir, err := GetNSRunDir()
if err != nil { if err != nil {
return err return err
} }
nsPath := ns.Path() nsPath := netns.Path()
// Only unmount if it's been bind-mounted (don't touch namespaces in /proc...) // Only unmount if it's been bind-mounted (don't touch namespaces in /proc...)
if strings.HasPrefix(nsPath, nsRunDir) { if strings.HasPrefix(nsPath, nsRunDir) {
if err := unix.Unmount(nsPath, unix.MNT_DETACH); err != nil { if err := unix.Unmount(nsPath, unix.MNT_DETACH); err != nil {

1
vendor/modules.txt vendored
View File

@ -132,6 +132,7 @@ github.com/containers/common/pkg/download
github.com/containers/common/pkg/filters github.com/containers/common/pkg/filters
github.com/containers/common/pkg/flag github.com/containers/common/pkg/flag
github.com/containers/common/pkg/manifests github.com/containers/common/pkg/manifests
github.com/containers/common/pkg/netns
github.com/containers/common/pkg/parse github.com/containers/common/pkg/parse
github.com/containers/common/pkg/report github.com/containers/common/pkg/report
github.com/containers/common/pkg/report/camelcase github.com/containers/common/pkg/report/camelcase