Ignore default address-pools on API < 1.39

thaJeztah · thaJeztah · commit 7632ccbc66c8 · 2018-11-13T14:04:06.000+01:00
These options were added in API 1.39, so should be ignored
when using an older version of the API.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go
@@ -27,6 +27,12 @@ func (sr *swarmRouter) initCluster(ctx context.Context, w http.ResponseWriter, r
 		}
 		return errdefs.InvalidParameter(err)
 	}
+	version := httputils.VersionFromContext(ctx)
+	// DefaultAddrPool and SubnetSize were added in API 1.39. Ignore on older API versions.
+	if versions.LessThan(version, "1.39") {
+		req.DefaultAddrPool = nil
+		req.SubnetSize = 0
+	}
 	nodeID, err := sr.backend.Init(req)
 	if err != nil {
 		logrus.Errorf("Error initializing swarm: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ func (sr *swarmRouter) initCluster(ctx context.Context, w http.ResponseWriter, r`
`27`	`27`	`}`
`28`	`28`	`return errdefs.InvalidParameter(err)`
`29`	`29`	`}`
	`30`	`+ version := httputils.VersionFromContext(ctx)`
	`31`	`+ // DefaultAddrPool and SubnetSize were added in API 1.39. Ignore on older API versions.`
	`32`	`+ if versions.LessThan(version, "1.39") {`
	`33`	`+ req.DefaultAddrPool = nil`
	`34`	`+ req.SubnetSize = 0`
	`35`	`+ }`
`30`	`36`	`nodeID, err := sr.backend.Init(req)`
`31`	`37`	`if err != nil {`
`32`	`38`	`logrus.Errorf("Error initializing swarm: %v", err)`