Merge pull request #3029 from vito/cni-conflist

support .conflist CNI configs
moby · Aug 20, 2022 · cdd7d20 · cdd7d20
2 parents 35fb6c8 + 6f68930
commit cdd7d20
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/util/network/cniprovider/cni.go b/util/network/cniprovider/cni.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"runtime"
+	"strings"
 
 	cni "github.com/containerd/go-cni"
 	"github.com/gofrs/flock"
@@ -35,7 +36,11 @@ func New(opt Opt) (network.Provider, error) {
 		cniOptions = append(cniOptions, cni.WithLoNetwork)
 	}
 
-	cniOptions = append(cniOptions, cni.WithConfFile(opt.ConfigPath))
+	if strings.HasSuffix(opt.ConfigPath, ".conflist") {
+		cniOptions = append(cniOptions, cni.WithConfListFile(opt.ConfigPath))
+	} else {
+		cniOptions = append(cniOptions, cni.WithConfFile(opt.ConfigPath))
+	}
 
 	cniHandle, err := cni.New(cniOptions...)
 	if err != nil {