Merge pull request #1233 from selansen/default_addr_pool

Global Default Address Pool feature support

Author: crosbymichael

cli/command/swarm/init.go

@@ -3,6 +3,7 @@ package swarm
 import (
 	"context"
 	"fmt"
+	"net"
 	"strings"
 
 	"github.com/docker/cli/cli"
@@ -17,10 +18,12 @@ type initOptions struct {
 	swarmOptions
 	listenAddr NodeAddrOption
 	// Not a NodeAddrOption because it has no default port.
-	advertiseAddr   string
-	dataPathAddr    string
-	forceNewCluster bool
-	availability    string
+	advertiseAddr             string
+	dataPathAddr              string
+	forceNewCluster           bool
+	availability              string
+	defaultAddrPools          []net.IPNet
+	DefaultAddrPoolMaskLength uint32
 }
 
 func newInitCommand(dockerCli command.Cli) *cobra.Command {
@@ -45,21 +48,32 @@ func newInitCommand(dockerCli command.Cli) *cobra.Command {
 	flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state")
 	flags.BoolVar(&opts.autolock, flagAutolock, false, "Enable manager autolocking (requiring an unlock key to start a stopped manager)")
 	flags.StringVar(&opts.availability, flagAvailability, "active", `Availability of the node ("active"|"pause"|"drain")`)
+	flags.IPNetSliceVar(&opts.defaultAddrPools, flagDefaultAddrPool, []net.IPNet{}, "default address pool in CIDR format")
+	flags.SetAnnotation(flagDefaultAddrPool, "version", []string{"1.39"})
+	flags.Uint32Var(&opts.DefaultAddrPoolMaskLength, flagDefaultAddrPoolMaskLength, 24, "default address pool subnet mask length")
+	flags.SetAnnotation(flagDefaultAddrPoolMaskLength, "version", []string{"1.39"})
 	addSwarmFlags(flags, &opts.swarmOptions)
 	return cmd
 }
 
 func runInit(dockerCli command.Cli, flags *pflag.FlagSet, opts initOptions) error {
+	var defaultAddrPool []string
+
 	client := dockerCli.Client()
 	ctx := context.Background()
 
+	for _, p := range opts.defaultAddrPools {
+		defaultAddrPool = append(defaultAddrPool, p.String())
+	}
 	req := swarm.InitRequest{
 		ListenAddr:       opts.listenAddr.String(),
 		AdvertiseAddr:    opts.advertiseAddr,
 		DataPathAddr:     opts.dataPathAddr,
+		DefaultAddrPool:  defaultAddrPool,
 		ForceNewCluster:  opts.forceNewCluster,
 		Spec:             opts.swarmOptions.ToSpec(flags),
 		AutoLockManagers: opts.swarmOptions.autolock,
+		SubnetSize:       opts.DefaultAddrPoolMaskLength,
 	}
 	if flags.Changed(flagAvailability) {
 		availability := swarm.NodeAvailability(strings.ToLower(opts.availability))

cli/command/swarm/opts.go

@@ -17,22 +17,24 @@ import (
 const (
 	defaultListenAddr = "0.0.0.0:2377"
 
-	flagCertExpiry          = "cert-expiry"
-	flagDispatcherHeartbeat = "dispatcher-heartbeat"
-	flagListenAddr          = "listen-addr"
-	flagAdvertiseAddr       = "advertise-addr"
-	flagDataPathAddr        = "data-path-addr"
-	flagQuiet               = "quiet"
-	flagRotate              = "rotate"
-	flagToken               = "token"
-	flagTaskHistoryLimit    = "task-history-limit"
-	flagExternalCA          = "external-ca"
-	flagMaxSnapshots        = "max-snapshots"
-	flagSnapshotInterval    = "snapshot-interval"
-	flagAutolock            = "autolock"
-	flagAvailability        = "availability"
-	flagCACert              = "ca-cert"
-	flagCAKey               = "ca-key"
+	flagCertExpiry                = "cert-expiry"
+	flagDispatcherHeartbeat       = "dispatcher-heartbeat"
+	flagListenAddr                = "listen-addr"
+	flagAdvertiseAddr             = "advertise-addr"
+	flagDataPathAddr              = "data-path-addr"
+	flagDefaultAddrPool           = "default-addr-pool"
+	flagDefaultAddrPoolMaskLength = "default-addr-pool-mask-length"
+	flagQuiet                     = "quiet"
+	flagRotate                    = "rotate"
+	flagToken                     = "token"
+	flagTaskHistoryLimit          = "task-history-limit"
+	flagExternalCA                = "external-ca"
+	flagMaxSnapshots              = "max-snapshots"
+	flagSnapshotInterval          = "snapshot-interval"
+	flagAutolock                  = "autolock"
+	flagAvailability              = "availability"
+	flagCACert                    = "ca-cert"
+	flagCAKey                     = "ca-key"
 )
 
 type swarmOptions struct {

cli/command/system/info.go

@@ -248,6 +248,7 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
 	return nil
 }
 
+// nolint: gocyclo
 func printSwarmInfo(dockerCli command.Cli, info types.Info) {
 	if info.Swarm.LocalNodeState == swarm.LocalNodeStateInactive || info.Swarm.LocalNodeState == swarm.LocalNodeStateLocked {
 		return
@@ -261,7 +262,16 @@ func printSwarmInfo(dockerCli command.Cli, info types.Info) {
 		fmt.Fprintln(dockerCli.Out(), " ClusterID:", info.Swarm.Cluster.ID)
 		fmt.Fprintln(dockerCli.Out(), " Managers:", info.Swarm.Managers)
 		fmt.Fprintln(dockerCli.Out(), " Nodes:", info.Swarm.Nodes)
+		var strAddrPool strings.Builder
+		if info.Swarm.Cluster.DefaultAddrPool != nil {
+			for _, p := range info.Swarm.Cluster.DefaultAddrPool {
+				strAddrPool.WriteString(p + "  ")
+			}
+			fmt.Fprintln(dockerCli.Out(), " Default Address Pool:", strAddrPool.String())
+			fmt.Fprintln(dockerCli.Out(), " SubnetSize:", info.Swarm.Cluster.SubnetSize)
+		}
 		fmt.Fprintln(dockerCli.Out(), " Orchestration:")
+
 		taskHistoryRetentionLimit := int64(0)
 		if info.Swarm.Cluster.Spec.Orchestration.TaskHistoryRetentionLimit != nil {
 			taskHistoryRetentionLimit = *info.Swarm.Cluster.Spec.Orchestration.TaskHistoryRetentionLimit

contrib/completion/bash/docker

@@ -3697,7 +3697,7 @@ _docker_swarm_init() {
 			COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) )
 			return
 			;;
-		--cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit)
+		--cert-expiry|--default-addr-pool|--default-addr-pool-mask-length|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit )
 			return
 			;;
 		--data-path-addr)
@@ -3717,7 +3717,7 @@ _docker_swarm_init() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--advertise-addr --autolock --availability --cert-expiry --data-path-addr --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--advertise-addr --autolock --availability --cert-expiry --data-path-addr --default-addr-pool --default-addr-pool-mask-length --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) )
 			;;
 	esac
 }

contrib/completion/zsh/_docker

@@ -2285,6 +2285,8 @@ __docker_swarm_subcommand() {
                 $opts_help \
                 "($help)--advertise-addr=[Advertised address]:ip\:port: " \
                 "($help)--data-path-addr=[Data path IP or interface]:ip " \
+                "($help)--default-addr-pool=[Default address pool]" \
+                "($help)--default-addr-pool-mask-length=[Default address pool subnet mask length]" \
                 "($help)--autolock[Enable manager autolocking]" \
                 "($help)--availability=[Availability of the node]:availability:(active drain pause)" \
                 "($help)--cert-expiry=[Validity period for node certificates]:duration: " \

docs/reference/commandline/swarm_init.md

@@ -26,6 +26,8 @@ Options:
       --availability string             Availability of the node ("active"|"pause"|"drain") (default "active")
       --cert-expiry duration            Validity period for node certificates (ns|us|ms|s|m|h) (default 2160h0m0s)
       --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)
+      --default-addr-pool IPnet         List of default address pool (format: <cidr>)
+      --default-addr-pool-mask-length   Subnet mask length for default address pool (default 24)
       --dispatcher-heartbeat duration   Dispatcher heartbeat period (ns|us|ms|s|m|h) (default 5s)
       --external-ca external-ca         Specifications of one or more certificate signing endpoints
       --force-new-cluster               Force create a new cluster from current state
@@ -128,6 +130,14 @@ management traffic of the cluster.
 If unspecified, Docker will use the same IP address or interface that is used for the
 advertise address.
 
+### `--default-addr-pool`
+This flag specifies default subnet pools for global scope networks.
+Format example is `--default-addr-pool 30.30.0.0/16 --default-addr-pool 40.40.0.0/16`
+
+### `--default-addr-pool-mask-length`
+This flag specifies default subnet pools mask length for default-addr-pool.
+Format example is `--default-addr-pool-mask-length 24`
+
 ### `--task-history-limit`
 
 This flag sets up task history retention limit.

vendor.conf

@@ -12,7 +12,7 @@ github.com/cpuguy83/go-md2man v1.0.8
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 # v1.1.0
 github.com/dgrijalva/jwt-go a2c85815a77d0f951e33ba4db5ae93629a1530af
 github.com/docker/distribution 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
-github.com/docker/docker 991682749612d6613d5f49035f62e2a479c0dc59
+github.com/docker/docker 1800883bd16664846db1572b8c8fbe8c85892cee
 github.com/docker/docker-credential-helpers 5241b46610f2491efdf9d1c85f1ddf5b02f6d962
 # the docker/go package contains a customized version of canonical/json
 # and is used by Notary. The package is periodically rebased on current Go versions.
@@ -23,7 +23,7 @@ github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
 github.com/docker/go-units 47565b4f722fb6ceae66b95f853feed578a4a51c # v0.3.3
 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
 github.com/docker/licensing 369e530
-github.com/docker/swarmkit edd5641391926a50bc5f7040e20b7efc05003c26
+github.com/docker/swarmkit cfa742c8abe6f8e922f6e4e920153c408e7d9c3b
 github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
 github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 # v1.0.0
 github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
@@ -72,7 +72,8 @@ github.com/satori/go.uuid d41af8bb6a7704f00bc3b7cba9355ae6a5a80048
 github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77
 github.com/sirupsen/logrus v1.0.6
 github.com/spf13/cobra v0.0.3
-github.com/spf13/pflag v1.0.1
+# temporary fork with https://github.com/spf13/pflag/pull/170 applied, which isn't merged yet upstream
+github.com/spf13/pflag 4cb166e4f25ac4e8016a3595bbf7ea2e9aa85a2c https://github.com/thaJeztah/pflag.git
 github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
 github.com/theupdateframework/notary v0.6.1
 github.com/tonistiigi/fsutil b19464cd1b6a00773b4f2eb7acf9c30426f9df42