Skip to content

Add WithPluginDirsAndCacheDir option and deprecate WithPluginDir option #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Voldemat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add WithPluginDirsAndCacheDir option and deprecate WithPluginDir option #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,27 @@ func WithInterfacePrefix(prefix string) Opt {
}
}

// WithPluginDirsAndCacheDir can be used to set the locations of
// the cni plugin binaries and cni cache dir
// cacheDir: to use default provided in libcni set value to empty string
func WithPluginDirsAndCacheDir(pluginDirs []string, cacheDir string) Opt {
return func(c *libcni) error {
c.pluginDirs = pluginDirs
c.cniConfig = cnilibrary.NewCNIConfigWithCacheDir(
pluginDirs,
cacheDir,
&invoke.DefaultExec{
RawExec: &invoke.RawExec{Stderr: os.Stderr},
PluginDecoder: version.PluginDecoder{},
},
)
return nil
}
}

// WithPluginDir can be used to set the locations of
// the cni plugin binaries
// Deprecated: use WithPluginDirsAndCacheDir instead
func WithPluginDir(dirs []string) Opt {
return func(c *libcni) error {
c.pluginDirs = dirs
Expand Down
Loading