Skip to content

Add v3.8 schema support #7217

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
ulyssessouza merged 5 commits into from
Feb 10, 2020
Merged

Add v3.8 schema support #7217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
391e5a6
Add v3.8 schema support
Feb 5, 2020
09c80ce
test update - remove 'placement' from unsupported fields
Feb 6, 2020
d9b0fab
update api version for 3.8
Feb 6, 2020
02d8e9e
set min engine version needed for v38 schema support
Feb 7, 2020
79fe7ca
add warning when max_replicas_per_node limits scale
Feb 10, 2020
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
9 changes: 7 additions & 2 deletions compose/config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,12 +990,17 @@ def translate_deploy_keys_to_container_config(service_dict):

deploy_dict = service_dict['deploy']
ignored_keys = [
k for k in ['endpoint_mode', 'labels', 'update_config', 'rollback_config', 'placement']
k for k in ['endpoint_mode', 'labels', 'update_config', 'rollback_config']
if k in deploy_dict
]

if 'replicas' in deploy_dict and deploy_dict.get('mode', 'replicated') == 'replicated':
service_dict['scale'] = deploy_dict['replicas']
scale = deploy_dict.get('replicas', 1)
max_replicas = deploy_dict.get('placement', {}).get('max_replicas_per_node', scale)
service_dict['scale'] = min(scale, max_replicas)
if max_replicas < scale:
log.warning("Scale is limited to {} ('max_replicas_per_node' field).".format(
max_replicas))

if 'restart_policy' in deploy_dict:
service_dict['restart'] = {
Expand Down
Loading