kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #38196 from thaJeztah/fence_default_addr_pools

Browse source 
Ignore default address-pools on API < 1.39
This commit is contained in:
Yong Tang 2018-11-19 20:23:09 -08:00 • committed by GitHub
commit 04287e4934
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/server/router/swarm/cluster_routes.go
View file

@ -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)