Add maximum replicas per node support to stack version 3.8

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
docker · Jan 14, 2019 · 85406d1 · 85406d1
1 parent 1b8d1e2
commit 85406d1
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 35 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/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.8.json b/cli/compose/schema/data/config_schema_v3.8.json
@@ -424,7 +424,8 @@
                 },
                 "additionalProperties": false
               }
-            }
+            },
+            "max_replicas_per_node": {"type": "integer"}
           },
           "additionalProperties": false
         }

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -346,6 +346,7 @@ type RestartPolicy struct {
 type Placement struct {
 	Constraints []string               `yaml:",omitempty" json:"constraints,omitempty"`
 	Preferences []PlacementPreferences `yaml:",omitempty" json:"preferences,omitempty"`
+	MaxReplicas uint64                 `yaml:",omitempty" json:"max_replicas_per_node,omitempty"`
 }
 
 // PlacementPreferences is the preferences for a service placement
-Original file line number
+Diff line change
@@ Expand Up / @@ -424,7 +424,8 @@ @@
                     },
                     "additionalProperties": false
                   }
-                }
+                },
+                "max_replicas_per_node": {"type": "integer"}
               },
               "additionalProperties": false
             }
@@ Expand Down @@