diff options
| -rw-r--r-- | vendor.mod | 2 | ||||
| -rw-r--r-- | vendor.sum | 4 | ||||
| -rw-r--r-- | vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go | 7 | ||||
| -rw-r--r-- | vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/manager.go | 94 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
5 files changed, 104 insertions, 5 deletions
diff --git a/vendor.mod b/vendor.mod index 0f917bf495..abc6ceaa1c 100644 --- a/vendor.mod +++ b/vendor.mod @@ -61,7 +61,7 @@ require ( github.com/moby/locker v1.0.1 github.com/moby/patternmatcher v0.5.0 github.com/moby/pubsub v1.0.0 - github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 + github.com/moby/swarmkit/v2 v2.0.0-20230406225228-75e92ce14ff7 github.com/moby/sys/mount v0.3.3 github.com/moby/sys/mountinfo v0.6.2 github.com/moby/sys/sequential v0.5.0 diff --git a/vendor.sum b/vendor.sum index c3d6b2b934..80baccc4ca 100644 --- a/vendor.sum +++ b/vendor.sum @@ -1051,8 +1051,8 @@ github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/pubsub v1.0.0 h1:jkp/imWsmJz2f6LyFsk7EkVeN2HxR/HTTOY8kHrsxfA= github.com/moby/pubsub v1.0.0/go.mod h1:bXSO+3h5MNXXCaEG+6/NlAIk7MMZbySZlnB+cUQhKKc= -github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 h1:jUbNDiRMDXd2rYoa4bcI+g3nIb4A1R8HNCe9wdCdh8I= -github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83/go.mod h1:GvjR7mC8YuUd9Mq44lrrIZPaXyKPAGEUMBpAQzaj3dI= +github.com/moby/swarmkit/v2 v2.0.0-20230406225228-75e92ce14ff7 h1:h6NclNly6/B9N4IdM5pcBaq/LkNLuaCmE7B44Vj+pb0= +github.com/moby/swarmkit/v2 v2.0.0-20230406225228-75e92ce14ff7/go.mod h1:P/ha3F7UZMmuUvqrHw9cZK/BjktSngQIgRPiairNHTc= github.com/moby/sys/mount v0.1.0/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= github.com/moby/sys/mount v0.1.1/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= github.com/moby/sys/mount v0.3.3 h1:fX1SVkXFJ47XWDoeFW4Sq7PdQJnV2QIDZAqjNqgEjUs= diff --git a/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go index e7d3dbe710..abc6c44aac 100644 --- a/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go +++ b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go @@ -9,9 +9,14 @@ import ( var initializers = []initializer{ {remote.Init, "remote"}, {ovmanager.Init, "overlay"}, + {StubManagerInit("internal"), "internal"}, + {StubManagerInit("l2bridge"), "l2bridge"}, + {StubManagerInit("nat"), "nat"}, } // PredefinedNetworks returns the list of predefined network structures func PredefinedNetworks() []networkallocator.PredefinedNetworkData { - return nil + return []networkallocator.PredefinedNetworkData{ + {Name: "nat", Driver: "nat"}, + } } diff --git a/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/manager.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/manager.go new file mode 100644 index 0000000000..bfc0e9a7af --- /dev/null +++ b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/manager.go @@ -0,0 +1,94 @@ +package cnmallocator + +import ( + "github.com/docker/docker/libnetwork/datastore" + "github.com/docker/docker/libnetwork/discoverapi" + "github.com/docker/docker/libnetwork/driverapi" + "github.com/docker/docker/libnetwork/types" +) + +type manager struct { + networkType string +} + +func StubManagerInit(networkType string) func(dc driverapi.DriverCallback, config map[string]interface{}) error { + return func(dc driverapi.DriverCallback, config map[string]interface{}) error { + return RegisterManager(dc, networkType) + } +} + +// Register registers a new instance of the manager driver for networkType with r. +func RegisterManager(r driverapi.DriverCallback, networkType string) error { + c := driverapi.Capability{ + DataScope: datastore.LocalScope, + ConnectivityScope: datastore.LocalScope, + } + return r.RegisterDriver(networkType, &manager{networkType: networkType}, c) +} + +func (d *manager) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) { + return nil, types.NotImplementedErrorf("not implemented") +} + +func (d *manager) NetworkFree(id string) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) CreateNetwork(id string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) EventNotify(etype driverapi.EventType, nid, tableName, key string, value []byte) { +} + +func (d *manager) DecodeTableEntry(tablename string, key string, value []byte) (string, map[string]string) { + return "", nil +} + +func (d *manager) DeleteNetwork(nid string) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]interface{}) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) DeleteEndpoint(nid, eid string) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) EndpointOperInfo(nid, eid string) (map[string]interface{}, error) { + return nil, types.NotImplementedErrorf("not implemented") +} + +func (d *manager) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) Leave(nid, eid string) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) Type() string { + return d.networkType +} + +func (d *manager) IsBuiltIn() bool { + return true +} + +func (d *manager) DiscoverNew(dType discoverapi.DiscoveryType, data interface{}) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) DiscoverDelete(dType discoverapi.DiscoveryType, data interface{}) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) ProgramExternalConnectivity(nid, eid string, options map[string]interface{}) error { + return types.NotImplementedErrorf("not implemented") +} + +func (d *manager) RevokeExternalConnectivity(nid, eid string) error { + return types.NotImplementedErrorf("not implemented") +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 549c04a4d9..16a0925272 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -735,7 +735,7 @@ github.com/moby/patternmatcher # github.com/moby/pubsub v1.0.0 ## explicit; go 1.19 github.com/moby/pubsub -# github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 +# github.com/moby/swarmkit/v2 v2.0.0-20230406225228-75e92ce14ff7 ## explicit; go 1.18 github.com/moby/swarmkit/v2/agent github.com/moby/swarmkit/v2/agent/configs |