Merge pull request #35 from AliyunContainerService/master

Support placement preferences in stack deployment
docker · May 9, 2017 · 3d58c3f · 3d58c3f
2 parents 2daa598 + b345993
commit 3d58c3f
Show file tree

Hide file tree

Showing 7 changed files with 565 additions and 6 deletions.
diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -135,6 +135,7 @@ func convertService(
 			RestartPolicy: restartPolicy,
 			Placement: &swarm.Placement{
 				Constraints: service.Deploy.Placement.Constraints,
+				Preferences: getPlacementPreference(service.Deploy.Placement.Preferences),
 			},
 		},
 		EndpointSpec: endpoint,
@@ -157,6 +158,19 @@ func convertService(
 	return serviceSpec, nil
 }
 
+func getPlacementPreference(preferences []composetypes.PlacementPreferences) []swarm.PlacementPreference {
+	result := []swarm.PlacementPreference{}
+	for _, preference := range preferences {
+		spreadDescriptor := preference.Spread
+		result = append(result, swarm.PlacementPreference{
+			Spread: &swarm.SpreadOver{
+				SpreadDescriptor: spreadDescriptor,
+			},
+		})
+	}
+	return result
+}
+
 func sortStrings(strs []string) []string {
 	sort.Strings(strs)
 	return strs

diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -1,4 +1,4 @@
-version: "3.2"
+version: "3.3"
 
 services:
   foo:
@@ -45,6 +45,8 @@ services:
         window: 120s
       placement:
         constraints: [node=foo]
+        preferences:
+          - spread: node.labels.az
       endpoint_mode: dnsrr
 
     devices:

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -673,6 +673,11 @@ func TestFullExample(t *testing.T) {
 			},
 			Placement: types.Placement{
 				Constraints: []string{"node=foo"},
+				Preferences: []types.PlacementPreferences{
+					{
+						Spread: "node.labels.az",
+					},
+				},
 			},
 			EndpointMode: "dnsrr",
 		},

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