Merge pull request #38813 from cpuguy83/add_experimental_interface

thaJeztah · web-flow · commit 8aca18d631f3 · 2019-03-02T00:10:49.000+01:00
Had `HasExperimental()` to cluster backend
diff --git a/daemon/cluster/executor/backend.go b/daemon/cluster/executor/backend.go
@@ -61,6 +61,7 @@ type Backend interface {
 	PluginManager() *plugin.Manager
 	PluginGetter() *plugin.Store
 	GetAttachmentStore() *networkSettings.AttachmentStore
+	HasExperimental() bool
 }
 
 // VolumeBackend is used by an executor to perform volume operations
diff --git a/daemon/cluster/executor/container/executor.go b/daemon/cluster/executor/container/executor.go
@@ -229,8 +229,7 @@ func (e *executor) Controller(t *api.Task) (exec.Controller, error) {
 		}
 		switch runtimeKind {
 		case string(swarmtypes.RuntimePlugin):
-			info, _ := e.backend.SystemInfo()
-			if !info.ExperimentalBuild {
+			if !e.backend.HasExperimental() {
 				return ctlr, fmt.Errorf("runtime type %q only supported in experimental", swarmtypes.RuntimePlugin)
 			}
 			c, err := plugin.NewController(e.pluginBackend, t)
diff --git a/daemon/cluster/services.go b/daemon/cluster/services.go
@@ -144,8 +144,7 @@ func (c *Cluster) CreateService(s types.ServiceSpec, encodedAuth string, queryRe
 		case *swarmapi.TaskSpec_Generic:
 			switch serviceSpec.Task.GetGeneric().Kind {
 			case string(types.RuntimePlugin):
-				info, _ := c.config.Backend.SystemInfo()
-				if !info.ExperimentalBuild {
+				if !c.config.Backend.HasExperimental() {
 					return fmt.Errorf("runtime type %q only supported in experimental", types.RuntimePlugin)
 				}
 				if s.TaskTemplate.PluginSpec == nil {

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ type Backend interface {`
`61`	`61`	`PluginManager() *plugin.Manager`
`62`	`62`	`PluginGetter() *plugin.Store`
`63`	`63`	`GetAttachmentStore() *networkSettings.AttachmentStore`
	`64`	`+ HasExperimental() bool`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`// VolumeBackend is used by an executor to perform volume operations`
Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,7 @@ func (e executor) Controller(t api.Task) (exec.Controller, error) {`
`229`	`229`	`}`
`230`	`230`	`switch runtimeKind {`
`231`	`231`	`case string(swarmtypes.RuntimePlugin):`
`232`		`- info, _ := e.backend.SystemInfo()`
`233`		`- if !info.ExperimentalBuild {`
	`232`	`+ if !e.backend.HasExperimental() {`
`234`	`233`	`return ctlr, fmt.Errorf("runtime type %q only supported in experimental", swarmtypes.RuntimePlugin)`
`235`	`234`	`}`
`236`	`235`	`c, err := plugin.NewController(e.pluginBackend, t)`