Browse Source

Merge pull request #38196 from thaJeztah/fence_default_addr_pools

Ignore default address-pools on API < 1.39
Yong Tang 6 years ago
parent
commit
04287e4934
1 changed files with 6 additions and 0 deletions
  1. 6 0
      api/server/router/swarm/cluster_routes.go

+ 6 - 0
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)