From 2f9e685c6b1b33417e192eb9111b756b8d0cc473 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Fri, 11 Feb 2022 22:15:35 +0800 Subject: [PATCH] init exec when create CNIConfig Follow-up: #82 Signed-off-by: Wei Fu --- opts.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/opts.go b/opts.go index 76c6815..309d014 100644 --- a/opts.go +++ b/opts.go @@ -18,10 +18,13 @@ package cni import ( "fmt" + "os" "sort" "strings" cnilibrary "github.com/containernetworking/cni/libcni" + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/version" ) // Opt sets options for a CNI instance @@ -41,7 +44,13 @@ func WithInterfacePrefix(prefix string) Opt { func WithPluginDir(dirs []string) Opt { return func(c *libcni) error { c.pluginDirs = dirs - c.cniConfig = &cnilibrary.CNIConfig{Path: dirs} + c.cniConfig = cnilibrary.NewCNIConfig( + dirs, + &invoke.DefaultExec{ + RawExec: &invoke.RawExec{Stderr: os.Stderr}, + PluginDecoder: version.PluginDecoder{}, + }, + ) return nil } }