dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-06-30 19:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3029 from vito/cni-conflist

Browse Source 
support .conflist CNI configs
This commit is contained in:
Tõnis Tiigi
2022-08-19 18:30:39 -07:00
committed by GitHub
parent 35fb6c8e1a 6f6893038b
commit cdd7d20acf
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
util/network/cniprovider/cni.go
View File

@@ -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 {