Skip to content

Commit

Permalink
libnetwork/pasta: remove Setup2()
Browse files Browse the repository at this point in the history
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:
containers/podman#24417
containers/buildah#5724

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
  • Loading branch information
Luap99 committed Oct 30, 2024
1 parent a44f1f1 commit 1073a77
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion libnetwork/internal/rootlessnetns/netns_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
5 changes: 0 additions & 5 deletions libnetwork/pasta/pasta_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1073a77

Please sign in to comment.