Skip to content

Add maximum replicas per node support to stack version 3.8 #1410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 2 commits into from
Feb 20, 2019
Merged

Add maximum replicas per node support to stack version 3.8 #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b8d1e2
Add compose schema version 3.8
olljanat Jan 9, 2019
6347ab3
Add maximum replicas per node support to stack version 3.8
olljanat Sep 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cli/compose/convert/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion cli/compose/loader/full-example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"

services:
foo:
Expand Down Expand Up @@ -82,6 +82,7 @@ services:
window: 120s
placement:
constraints: [node=foo]
max_replicas_per_node: 5
preferences:
- spread: node.labels.az
endpoint_mode: dnsrr
Expand Down
11 changes: 7 additions & 4 deletions cli/compose/loader/full-struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1083,7 +1085,8 @@ func fullExampleJSON(workingDir string) string {
{
"spread": "node.labels.az"
}
]
],
"max_replicas_per_node": 5
},
"endpoint_mode": "dnsrr"
},
Expand Down Expand Up @@ -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",
Expand Down
44 changes: 44 additions & 0 deletions cli/compose/schema/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading