mirror of
https://github.com/psviderski/uncloud.git
synced 2026-10-06 13:18:58 +00:00
fix(compose): remove unnecessary warning validating deploy.mode that is error
This commit is contained in:
1 parent
8aedc2bf19
commit
5e01db5e20
2 files changed
+3
-18
No files matched your search
@@ -345,19 +345,7 @@ configs:
|
|||||||
warnContains: []string{"container_name"},
|
warnContains: []string{"container_name"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "deploy mode",
|
name: "deploy labels",
|
||||||
composeYAML: `services:
|
|
||||||
app:
|
|
||||||
image: myapp:latest
|
|
||||||
deploy:
|
|
||||||
mode: replicated-job
|
|
||||||
replicas: 2
|
|
||||||
`,
|
|
||||||
warnCount: 1,
|
|
||||||
warnContains: []string{"deploy mode must"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "deploy mode",
|
|
||||||
composeYAML: `services:
|
composeYAML: `services:
|
||||||
app:
|
app:
|
||||||
image: myapp:latest
|
image: myapp:latest
|
||||||
|
|||||||
@@ -502,7 +502,8 @@ func validateServicesFeatures(project *types.Project) []error {
|
|||||||
errs = append(errs, err(service.Name, "container_name"))
|
errs = append(errs, err(service.Name, "container_name"))
|
||||||
}
|
}
|
||||||
if service.Deploy != nil {
|
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(
|
errs = append(errs, fmt.Errorf(
|
||||||
"service '%s': deploy placement is not supported, "+
|
"service '%s': deploy placement is not supported, "+
|
||||||
"use x-machines instead: %s", service.Name,
|
"use x-machines instead: %s", service.Name,
|
||||||
@@ -513,10 +514,6 @@ func validateServicesFeatures(project *types.Project) []error {
|
|||||||
errs = append(errs, fmt.Errorf(
|
errs = append(errs, fmt.Errorf(
|
||||||
"service '%s': deploy restart_policy defaults to 'unless-stopped'", service.Name))
|
"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 {
|
if service.Deploy.RollbackConfig != nil {
|
||||||
errs = append(errs, err(service.Name, "deploy rollback_config"))
|
errs = append(errs, err(service.Name, "deploy rollback_config"))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user