p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28914 from aaronlehmann/cluster-object

Browse Source 
cluster: Refuse swarm spec not named "default"
Upstream-commit: 82506fe9a97781c65544c6e769e974cd82b28fc2
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-11-29 15:41:05 +01:00
committed by GitHub
parent ce99f23b28 6eff6aab71
commit 66227b770b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/cluster/cluster.go
View File

@ -1825,6 +1825,12 @@ func validateAndSanitizeInitRequest(req *types.InitRequest) error {
return fmt.Errorf("invalid ListenAddr %q: %v", req.ListenAddr, err)
}
if req.Spec.Annotations.Name == "" {
req.Spec.Annotations.Name = "default"
} else if req.Spec.Annotations.Name != "default" {
return errors.New(`swarm spec must be named "default"`)
}
return nil
}