diff options
author | Tianon Gravi <admwiggin@gmail.com> | 2023-04-26 22:54:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-26 22:54:21 +0000 |
commit | 3eca54384d77840823c650930a3fd17282a825fb (patch) | |
tree | 345723577647f31f3a2e3ff92391b29ee458de02 /vendor | |
parent | 79dd26451709e26fa6dd069b43bc12d9bc06e130 (diff) | |
parent | 70229b55ec5e8d5b592518a8d56853700a499f0c (diff) | |
download | docker-3eca54384d77840823c650930a3fd17282a825fb.tar.gz |
Merge pull request #45291 from thaJeztah/bump_swarmkit
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230406225228-75e92ce14ff7
Diffstat (limited to 'vendor')
3 files changed, 101 insertions, 2 deletions
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 |