Merge pull request #2218 from Luap99/pasta2

libnetwork/pasta: remove Setup2()
containers · Oct 30, 2024 · 85d8883 · 85d8883
2 parents eda742d + 1073a77
commit 85d8883
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/libnetwork/internal/rootlessnetns/netns_linux.go b/libnetwork/internal/rootlessnetns/netns_linux.go
@@ -201,7 +201,7 @@ func (n *Netns) setupPasta(nsPath string) error {
 		Netns:        nsPath,
 		ExtraOptions: []string{"--pid", pidPath},
 	}
-	res, err := pasta.Setup2(&pastaOpts)
+	res, err := pasta.Setup(&pastaOpts)
 	if err != nil {
 		return fmt.Errorf("setting up Pasta: %w", err)
 	}

diff --git a/libnetwork/pasta/pasta_linux.go b/libnetwork/pasta/pasta_linux.go
@@ -50,11 +50,6 @@ type SetupOptions struct {
 	ExtraOptions []string
 }
 
-// Setup2 alias for Setup()
-func Setup2(opts *SetupOptions) (*SetupResult, error) {
-	return Setup(opts)
-}
-
 // Setup start the pasta process for the given netns.
 // The pasta binary is looked up in the HelperBinariesDir and $PATH.
 // Note that there is no need for any special cleanup logic, the pasta