Merge pull request #83 from fuweid/follow-fixdatarace

init exec when create CNIConfig
containerd · Feb 11, 2022 · e559bd8 · e559bd8
2 parents d5f63dc + 2f9e685
commit e559bd8
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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
 	}
 }