JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1114 from tonistiigi/cni-refactor 

network: refactor cni support to multiple packages
docker-19.03
Tibor Vass 2019-08-06 18:56:11 -07:00 committed by GitHub
parent 940aab83bc 57d19b1208
commit 4c09c48d1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 96 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/buildkitd/main_containerd_worker.go
View File

@ -10,7 +10,8 @@ import (
ctd "github.com/containerd/containerd"
"github.com/moby/buildkit/cmd/buildkitd/config"
"github.com/moby/buildkit/util/network"
"github.com/moby/buildkit/util/network/cniprovider"
"github.com/moby/buildkit/util/network/netproviders"
"github.com/moby/buildkit/worker"
"github.com/moby/buildkit/worker/base"
"github.com/moby/buildkit/worker/containerd"
@ -200,11 +201,13 @@ func containerdWorkerInitializer(c *cli.Context, common workerInitializerOpt) ([
dns := getDNSConfig(common.config.DNS)
nc := network.Opt{
Root: common.config.Root,
nc := netproviders.Opt{
Mode: common.config.Workers.Containerd.NetworkConfig.Mode,
CNIConfigPath: common.config.Workers.Containerd.CNIConfigPath,
CNIBinaryDir: common.config.Workers.Containerd.CNIBinaryPath,
CNI: cniprovider.Opt{
Root: common.config.Root,
ConfigPath: common.config.Workers.Containerd.CNIConfigPath,
BinaryDir: common.config.Workers.Containerd.CNIBinaryPath,
},
}
opt, err := containerd.NewWorkerOpt(common.config.Root, cfg.Address, ctd.DefaultSnapshotter, cfg.Namespace, cfg.Labels, dns, nc, ctd.WithTimeout(60*time.Second))

13
cmd/buildkitd/main_oci_worker.go
View File

@ -11,7 +11,8 @@ import (
"github.com/containerd/containerd/snapshots/overlay"
"github.com/moby/buildkit/cmd/buildkitd/config"
"github.com/moby/buildkit/executor/oci"
"github.com/moby/buildkit/util/network"
"github.com/moby/buildkit/util/network/cniprovider"
"github.com/moby/buildkit/util/network/netproviders"
"github.com/moby/buildkit/worker"
"github.com/moby/buildkit/worker/base"
"github.com/moby/buildkit/worker/runc"
@ -222,11 +223,13 @@ func ociWorkerInitializer(c *cli.Context, common workerInitializerOpt) ([]worker
dns := getDNSConfig(common.config.DNS)
nc := network.Opt{
Root: common.config.Root,
nc := netproviders.Opt{
Mode: common.config.Workers.OCI.NetworkConfig.Mode,
CNIConfigPath: common.config.Workers.OCI.CNIConfigPath,
CNIBinaryDir: common.config.Workers.OCI.CNIBinaryPath,
CNI: cniprovider.Opt{
Root: common.config.Root,
ConfigPath: common.config.Workers.OCI.CNIConfigPath,
BinaryDir: common.config.Workers.OCI.CNIBinaryPath,
},
}
opt, err := runc.NewWorkerOpt(common.config.Root, snFactory, cfg.Rootless, processMode, cfg.Labels, idmapping, nc, dns)

0
util/network/allowempty.s → util/network/cniprovider/allowempty.s
View File

25
util/network/cni.go → util/network/cniprovider/cni.go
View File

@ -1,4 +1,4 @@
package network
package cniprovider
import (
"os"
@ -9,23 +9,30 @@ import (
"github.com/containerd/go-cni"
"github.com/gofrs/flock"
"github.com/moby/buildkit/identity"
"github.com/moby/buildkit/util/network"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
func NewCNIProvider(opt Opt) (Provider, error) {
if _, err := os.Stat(opt.CNIConfigPath); err != nil {
return nil, errors.Wrapf(err, "failed to read cni config %q", opt.CNIConfigPath)
type Opt struct {
Root string
ConfigPath string
BinaryDir string
}
if _, err := os.Stat(opt.CNIBinaryDir); err != nil {
return nil, errors.Wrapf(err, "failed to read cni binary dir %q", opt.CNIBinaryDir)
func New(opt Opt) (network.Provider, error) {
if _, err := os.Stat(opt.ConfigPath); err != nil {
return nil, errors.Wrapf(err, "failed to read cni config %q", opt.ConfigPath)
}
if _, err := os.Stat(opt.BinaryDir); err != nil {
return nil, errors.Wrapf(err, "failed to read cni binary dir %q", opt.BinaryDir)
}
cniHandle, err := cni.New(
cni.WithMinNetworkCount(2),
cni.WithConfFile(opt.CNIConfigPath),
cni.WithPluginDir([]string{opt.CNIBinaryDir}),
cni.WithConfFile(opt.ConfigPath),
cni.WithPluginDir([]string{opt.BinaryDir}),
cni.WithLoNetwork,
cni.WithInterfacePrefix(("eth")))
if err != nil {
@ -63,7 +70,7 @@ func (c *cniProvider) initNetwork() error {
return ns.Close()
}
func (c *cniProvider) New() (Namespace, error) {
func (c *cniProvider) New() (network.Namespace, error) {
id := identity.NewID()
nsPath := filepath.Join(c.root, "net/cni", id)
if err := os.MkdirAll(filepath.Dir(nsPath), 0700); err != nil {

2
util/network/cni_unsafe.go → util/network/cniprovider/cni_unsafe.go
View File

@ -1,6 +1,6 @@
// +build linux
package network
package cniprovider
import (
_ "unsafe" // required for go:linkname.

2
util/network/createns_linux.go → util/network/cniprovider/createns_linux.go
View File

@ -1,6 +1,6 @@
// +build linux
package network
package cniprovider
import (
"os"

2
util/network/createns_nolinux.go → util/network/cniprovider/createns_nolinux.go
View File

@ -1,6 +1,6 @@
// +build !linux
package network
package cniprovider
import "github.com/pkg/errors"

50
util/network/netproviders/network.go Normal file
View File

@ -0,0 +1,50 @@
package netproviders
import (
"os"
"github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/util/network"
"github.com/moby/buildkit/util/network/cniprovider"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
type Opt struct {
CNI cniprovider.Opt
Mode string
}
// Providers returns the network provider set
func Providers(opt Opt) (map[pb.NetMode]network.Provider, error) {
var defaultProvider network.Provider
switch opt.Mode {
case "cni":
cniProvider, err := cniprovider.New(opt.CNI)
if err != nil {
return nil, err
}
defaultProvider = cniProvider
case "host":
defaultProvider = network.NewHostProvider()
case "auto", "":
if _, err := os.Stat(opt.CNI.ConfigPath); err == nil {
cniProvider, err := cniprovider.New(opt.CNI)
if err != nil {
return nil, err
}
defaultProvider = cniProvider
} else {
logrus.Warnf("using host network as the default")
defaultProvider = network.NewHostProvider()
}
default:
return nil, errors.Errorf("invalid network mode: %q", opt.Mode)
}
return map[pb.NetMode]network.Provider{
pb.NetMode_UNSET: defaultProvider,
pb.NetMode_HOST: network.NewHostProvider(),
pb.NetMode_NONE: network.NewNoneProvider(),
}, nil
}

52
util/network/network.go
View File

@ -2,55 +2,10 @@ package network
import (
"io"
"os"
"github.com/moby/buildkit/solver/pb"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
type Opt struct {
Root string
Mode string
CNIConfigPath string
CNIBinaryDir string
}
// Providers returns the network provider set
func Providers(opt Opt) (map[pb.NetMode]Provider, error) {
var defaultProvider Provider
switch opt.Mode {
case "cni":
cniProvider, err := NewCNIProvider(opt)
if err != nil {
return nil, err
}
defaultProvider = cniProvider
case "host":
defaultProvider = NewHostProvider()
case "auto", "":
if _, err := os.Stat(opt.CNIConfigPath); err == nil {
cniProvider, err := NewCNIProvider(opt)
if err != nil {
return nil, err
}
defaultProvider = cniProvider
} else {
logrus.Warnf("using host network as the default")
defaultProvider = NewHostProvider()
}
default:
return nil, errors.Errorf("invalid network mode: %q", opt.Mode)
}
return map[pb.NetMode]Provider{
pb.NetMode_UNSET: defaultProvider,
pb.NetMode_HOST: NewHostProvider(),
pb.NetMode_NONE: NewNoneProvider(),
}, nil
}
// Provider interface for Network
type Provider interface {
New() (Namespace, error)
@ -62,10 +17,3 @@ type Namespace interface {
// Set the namespace on the spec
Set(*specs.Spec)
}
// NetworkOpts hold network options
type NetworkOpts struct {
Type string
CNIConfigPath string
CNIPluginPath string
}

8
worker/containerd/containerd.go
View File

@ -17,7 +17,7 @@ import (
"github.com/moby/buildkit/identity"
containerdsnapshot "github.com/moby/buildkit/snapshot/containerd"
"github.com/moby/buildkit/util/leaseutil"
"github.com/moby/buildkit/util/network"
"github.com/moby/buildkit/util/network/netproviders"
"github.com/moby/buildkit/util/throttle"
"github.com/moby/buildkit/util/winlayers"
"github.com/moby/buildkit/worker/base"
@ -27,7 +27,7 @@ import (
)
// NewWorkerOpt creates a WorkerOpt.
func NewWorkerOpt(root string, address, snapshotterName, ns string, labels map[string]string, dns *oci.DNSConfig, nopt network.Opt, opts ...containerd.ClientOpt) (base.WorkerOpt, error) {
func NewWorkerOpt(root string, address, snapshotterName, ns string, labels map[string]string, dns *oci.DNSConfig, nopt netproviders.Opt, opts ...containerd.ClientOpt) (base.WorkerOpt, error) {
opts = append(opts, containerd.WithDefaultNamespace(ns))
client, err := containerd.New(address, opts...)
if err != nil {
@ -36,7 +36,7 @@ func NewWorkerOpt(root string, address, snapshotterName, ns string, labels map[s
return newContainerd(root, client, snapshotterName, ns, labels, dns, nopt)
}
func newContainerd(root string, client *containerd.Client, snapshotterName, ns string, labels map[string]string, dns *oci.DNSConfig, nopt network.Opt) (base.WorkerOpt, error) {
func newContainerd(root string, client *containerd.Client, snapshotterName, ns string, labels map[string]string, dns *oci.DNSConfig, nopt netproviders.Opt) (base.WorkerOpt, error) {
if strings.Contains(snapshotterName, "/") {
return base.WorkerOpt{}, errors.Errorf("bad snapshotter name: %q", snapshotterName)
}
@ -103,7 +103,7 @@ func newContainerd(root string, client *containerd.Client, snapshotterName, ns s
}
}
np, err := network.Providers(nopt)
np, err := netproviders.Providers(nopt)
if err != nil {
return base.WorkerOpt{}, err
}

6
worker/runc/runc.go
View File

@ -18,7 +18,7 @@ import (
"github.com/moby/buildkit/executor/runcexecutor"
containerdsnapshot "github.com/moby/buildkit/snapshot/containerd"
"github.com/moby/buildkit/util/leaseutil"
"github.com/moby/buildkit/util/network"
"github.com/moby/buildkit/util/network/netproviders"
"github.com/moby/buildkit/util/throttle"
"github.com/moby/buildkit/util/winlayers"
"github.com/moby/buildkit/worker/base"
@ -34,7 +34,7 @@ type SnapshotterFactory struct {
}
// NewWorkerOpt creates a WorkerOpt.
func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, processMode oci.ProcessMode, labels map[string]string, idmap *idtools.IdentityMapping, nopt network.Opt, dns *oci.DNSConfig) (base.WorkerOpt, error) {
func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, processMode oci.ProcessMode, labels map[string]string, idmap *idtools.IdentityMapping, nopt netproviders.Opt, dns *oci.DNSConfig) (base.WorkerOpt, error) {
var opt base.WorkerOpt
name := "runc-" + snFactory.Name
root = filepath.Join(root, name)
@ -46,7 +46,7 @@ func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, proc
return opt, err
}
np, err := network.Providers(nopt)
np, err := netproviders.Providers(nopt)
if err != nil {
return opt, err
}

4
worker/runc/runc_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/snapshot"
"github.com/moby/buildkit/source"
"github.com/moby/buildkit/util/network"
"github.com/moby/buildkit/util/network/netproviders"
"github.com/moby/buildkit/worker/base"
"github.com/stretchr/testify/require"
)
@ -40,7 +40,7 @@ func newWorkerOpt(t *testing.T, processMode oci.ProcessMode) (base.WorkerOpt, fu
},
}
rootless := false
workerOpt, err := NewWorkerOpt(tmpdir, snFactory, rootless, processMode, nil, nil, network.Opt{Mode: "host"}, nil)
workerOpt, err := NewWorkerOpt(tmpdir, snFactory, rootless, processMode, nil, nil, netproviders.Opt{Mode: "host"}, nil)
require.NoError(t, err)
return workerOpt, cleanup