node: set VXLAN port through network provider

Remove the last direct libnetwork call outside of cnmallocator from
Swarmkit.

Signed-off-by: Cory Snider <[email protected]>

Author: corhere

manager/allocator/cnmallocator/provider.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/drivers/overlay/overlayutils"
 	"github.com/docker/docker/libnetwork/ipamapi"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/moby/swarmkit/v2/api"
@@ -84,3 +85,7 @@ func (p *Provider) validatePluginDriver(driver *api.Driver, pluginType string) e
 
 	return nil
 }
+
+func (p *Provider) SetDefaultVXLANUDPPort(port uint32) error {
+	return overlayutils.ConfigVXLANUDPPort(port)
+}

manager/allocator/networkallocator/inert.go

@@ -23,6 +23,11 @@ func (InertProvider) PredefinedNetworks() []PredefinedNetworkData {
 	return nil
 }
 
+// SetDefaultVXLANUDPPort is a no-op.
+func (InertProvider) SetDefaultVXLANUDPPort(uint32) error {
+	return nil
+}
+
 // ValidateIPAMDriver returns an InvalidArgument error unless d is nil.
 func (InertProvider) ValidateIPAMDriver(d *api.Driver) error {
 	if d == nil {

manager/allocator/networkallocator/networkallocator.go

@@ -112,6 +112,7 @@ type DriverValidator interface {
 type Provider interface {
 	DriverValidator
 	PredefinedNetworks() []PredefinedNetworkData
+	SetDefaultVXLANUDPPort(uint32) error
 	NewAllocator(*Config) (NetworkAllocator, error)
 }
 

node/node.go

@@ -15,7 +15,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/docker/libnetwork/drivers/overlay/overlayutils"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/go-metrics"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
@@ -164,7 +163,6 @@ type Node struct {
 	manager          *manager.Manager
 	notifyNodeChange chan *agent.NodeChanges // used by the agent to relay node updates from the dispatcher Session stream to (*Node).run
 	unlockKey        []byte
-	vxlanUDPPort     uint32
 }
 
 type lastSeenRole struct {
@@ -274,8 +272,11 @@ func (n *Node) currentRole() api.NodeRole {
 }
 
 // configVXLANUDPPort sets vxlan port in libnetwork
-func configVXLANUDPPort(ctx context.Context, vxlanUDPPort uint32) {
-	if err := overlayutils.ConfigVXLANUDPPort(vxlanUDPPort); err != nil {
+func (n *Node) configVXLANUDPPort(ctx context.Context, vxlanUDPPort uint32) {
+	if n.config.NetworkProvider == nil {
+		return
+	}
+	if err := n.config.NetworkProvider.SetDefaultVXLANUDPPort(vxlanUDPPort); err != nil {
 		log.G(ctx).WithError(err).Error("failed to configure VXLAN UDP port")
 		return
 	}
@@ -372,8 +373,7 @@ func (n *Node) run(ctx context.Context) (err error) {
 			case nodeChanges := <-n.notifyNodeChange:
 				if nodeChanges.Node != nil {
 					if nodeChanges.Node.VXLANUDPPort != 0 {
-						n.vxlanUDPPort = nodeChanges.Node.VXLANUDPPort
-						configVXLANUDPPort(ctx, n.vxlanUDPPort)
+						n.configVXLANUDPPort(ctx, nodeChanges.Node.VXLANUDPPort)
 					}
 					// This is a bit complex to be backward compatible with older CAs that
 					// don't support the Node.Role field. They only use what's presently