Merge pull request #1410 from olljanat/replicas-max-per-node

Add maximum replicas per node support to stack version 3.8
docker · Feb 20, 2019 · cfe12f4 · cfe12f4
2 parents db166da + 6347ab3
commit cfe12f4
Show file tree

Hide file tree

Showing 6 changed files with 658 additions and 5 deletions.
diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -158,6 +158,7 @@ func Service(
 			Placement: &swarm.Placement{
 				Constraints: service.Deploy.Placement.Constraints,
 				Preferences: getPlacementPreference(service.Deploy.Placement.Preferences),
+				MaxReplicas: service.Deploy.Placement.MaxReplicas,
 			},
 		},
 		EndpointSpec:   endpoint,

diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 services:
   foo:
@@ -82,6 +82,7 @@ services:
         window: 120s
       placement:
         constraints: [node=foo]
+        max_replicas_per_node: 5
         preferences:
           - spread: node.labels.az
       endpoint_mode: dnsrr

diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
@@ -10,7 +10,7 @@ import (
 
 func fullExampleConfig(workingDir, homeDir string) *types.Config {
 	return &types.Config{
-		Version:  "3.7",
+		Version:  "3.8",
 		Services: services(workingDir, homeDir),
 		Networks: networks(),
 		Volumes:  volumes(),
@@ -111,6 +111,7 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 				},
 				Placement: types.Placement{
 					Constraints: []string{"node=foo"},
+					MaxReplicas: uint64(5),
 					Preferences: []types.PlacementPreferences{
 						{
 							Spread: "node.labels.az",
@@ -507,7 +508,7 @@ func secrets(workingDir string) map[string]types.SecretConfig {
 }
 
 func fullExampleYAML(workingDir string) string {
-	return fmt.Sprintf(`version: "3.7"
+	return fmt.Sprintf(`version: "3.8"
 services:
   foo:
     build:
@@ -588,6 +589,7 @@ services:
         - node=foo
         preferences:
         - spread: node.labels.az
+        max_replicas_per_node: 5
       endpoint_mode: dnsrr
     devices:
     - /dev/ttyUSB0:/dev/ttyUSB0
@@ -1083,7 +1085,8 @@ func fullExampleJSON(workingDir string) string {
             {
               "spread": "node.labels.az"
             }
-          ]
+          ],
+          "max_replicas_per_node": 5
         },
         "endpoint_mode": "dnsrr"
       },
@@ -1383,7 +1386,7 @@ func fullExampleJSON(workingDir string) string {
       "working_dir": "/code"
     }
   },
-  "version": "3.7",
+  "version": "3.8",
   "volumes": {
     "another-volume": {
       "name": "user_specified_name",

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go