cluster: Refuse swarm spec not named "default"

Aaron Lehmann · Aaron Lehmann · commit 9dba9e3248f8 · 2016-11-28T17:19:29.000-08:00
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.

Signed-off-by: Aaron Lehmann &lt;aaron.lehmann@docker.com&gt;
diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go
@@ -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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1825,6 +1825,12 @@ func validateAndSanitizeInitRequest(req *types.InitRequest) error {`
`1825`	`1825`	`return fmt.Errorf("invalid ListenAddr %q: %v", req.ListenAddr, err)`
`1826`	`1826`	`}`
`1827`	`1827`
	`1828`	`+ if req.Spec.Annotations.Name == "" {`
	`1829`	`+ req.Spec.Annotations.Name = "default"`
	`1830`	`+ } else if req.Spec.Annotations.Name != "default" {`
	`1831`	+ return errors.New(`swarm spec must be named "default"`)
	`1832`	`+ }`
	`1833`	`+`
`1828`	`1834`	`return nil`
`1829`	`1835`	`}`
`1830`	`1836`