From 1073a776fd25c0639ddca6e8855a2059cdf760fd Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 30 Oct 2024 13:40:02 +0100 Subject: [PATCH] libnetwork/pasta: remove Setup2() This was just added as alias to allow vendoring without having to fix all callers at the same time. These are the PRs that update the callers: https://github.com/containers/podman/pull/24417 https://github.com/containers/buildah/pull/5724 Signed-off-by: Paul Holzinger --- libnetwork/internal/rootlessnetns/netns_linux.go | 2 +- libnetwork/pasta/pasta_linux.go | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libnetwork/internal/rootlessnetns/netns_linux.go b/libnetwork/internal/rootlessnetns/netns_linux.go index 84bc4f621..7fac465a6 100644 --- 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 index 10b667eb6..2ee6369ef 100644 --- 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