beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46109 from thaJeztah/windows_remove_discoverapi

Browse source 
libnetwork/driver: remove discoverAPI from Windows and Windows overlay
This commit is contained in:
Sebastiaan van Stijn 2023-08-01 10:51:56 +02:00 committed by GitHub
commit 39a13456c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnetwork/drivers/windows/overlay/overlay_windows.go
View file

@ -10,10 +10,8 @@ import (
"github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/docker/docker/libnetwork/discoverapi"
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/scope" "github.com/docker/docker/libnetwork/scope"
"github.com/docker/docker/libnetwork/types"
) )
const ( const (
@ -111,13 +109,3 @@ func (d *driver) Type() string {
func (d *driver) IsBuiltIn() bool { func (d *driver) IsBuiltIn() bool {
return true return true
} }
// DiscoverNew is a notification for a new discovery event, such as a new node joining a cluster
func (d *driver) DiscoverNew(dType discoverapi.DiscoveryType, data interface{}) error {
return types.NotImplementedErrorf("not implemented")
}
// DiscoverDelete is a notification for a discovery delete event, such as a node leaving a cluster
func (d *driver) DiscoverDelete(dType discoverapi.DiscoveryType, data interface{}) error {
return types.NotImplementedErrorf("not implemented")
}

11
libnetwork/drivers/windows/windows.go
View file

@ -23,7 +23,6 @@ import (
"github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/datastore"
"github.com/docker/docker/libnetwork/discoverapi"
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
"github.com/docker/docker/libnetwork/portmapper" "github.com/docker/docker/libnetwork/portmapper"
@ -905,13 +904,3 @@ func (d *driver) Type() string {
func (d *driver) IsBuiltIn() bool { func (d *driver) IsBuiltIn() bool {
return true return true
} }
// DiscoverNew is a notification for a new discovery event, such as a new node joining a cluster
func (d *driver) DiscoverNew(dType discoverapi.DiscoveryType, data interface{}) error {
return nil
}
// DiscoverDelete is a notification for a discovery delete event, such as a node leaving a cluster
func (d *driver) DiscoverDelete(dType discoverapi.DiscoveryType, data interface{}) error {
return nil
}