diff --git a/pkg/client/compose/project_test.go b/pkg/client/compose/project_test.go index fc0c45dc..bf8cc188 100644 --- a/pkg/client/compose/project_test.go +++ b/pkg/client/compose/project_test.go @@ -345,19 +345,7 @@ configs: warnContains: []string{"container_name"}, }, { - name: "deploy mode", - composeYAML: `services: - app: - image: myapp:latest - deploy: - mode: replicated-job - replicas: 2 -`, - warnCount: 1, - warnContains: []string{"deploy mode must"}, - }, - { - name: "deploy mode", + name: "deploy labels", composeYAML: `services: app: image: myapp:latest diff --git a/pkg/client/compose/service.go b/pkg/client/compose/service.go index 5a345d9a..b631b012 100644 --- a/pkg/client/compose/service.go +++ b/pkg/client/compose/service.go @@ -502,7 +502,8 @@ func validateServicesFeatures(project *types.Project) []error { errs = append(errs, err(service.Name, "container_name")) } if service.Deploy != nil { - if len(service.Deploy.Placement.Constraints) > 0 || len(service.Deploy.Placement.Preferences) > 0 { + if len(service.Deploy.Placement.Constraints) > 0 || len(service.Deploy.Placement.Preferences) > 0 || + service.Deploy.Placement.MaxReplicas > 0 { errs = append(errs, fmt.Errorf( "service '%s': deploy placement is not supported, "+ "use x-machines instead: %s", service.Name, @@ -513,10 +514,6 @@ func validateServicesFeatures(project *types.Project) []error { errs = append(errs, fmt.Errorf( "service '%s': deploy restart_policy defaults to 'unless-stopped'", service.Name)) } - if service.Deploy.Mode != "" && service.Deploy.Mode != "global" && service.Deploy.Mode != "replicated" { - errs = append(errs, fmt.Errorf( - "service '%s': deploy mode must either be 'global' or 'replicated'", service.Name)) - } if service.Deploy.RollbackConfig != nil { errs = append(errs, err(service.Name, "deploy rollback_config")) }