kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

remove RuntimeData from cluster and types

Browse source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2017-05-19 17:10:32 -04:00
parent f888a25ff5
commit 8eeba75198
No known key found for this signature in database
GPG key ID: A519480096146526
3 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/swagger.yaml
View file

@ -2174,9 +2174,6 @@ definitions:
Runtime: Runtime:
description: "Runtime is the type of runtime specified for the task executor." description: "Runtime is the type of runtime specified for the task executor."
type: "string" type: "string"
RuntimeData:
description: "RuntimeData is the payload sent to be used with the runtime for the executor."
type: "array"
Networks: Networks:
type: "array" type: "array"
items: items:

3
api/types/swarm/task.go
View file

@ -67,9 +67,6 @@ type TaskSpec struct {
ForceUpdate uint64 ForceUpdate uint64
Runtime RuntimeType `json:",omitempty"` Runtime RuntimeType `json:",omitempty"`
// TODO (ehazlett): this should be removed and instead
// use struct tags (proto) for the runtimes
RuntimeData []byte `json:",omitempty"`
} }
// Resources represents resources (CPU/Memory). // Resources represents resources (CPU/Memory).

2
daemon/cluster/convert/service.go
View file

@ -100,7 +100,6 @@ func serviceSpecFromGRPC(spec *swarmapi.ServiceSpec) (*types.ServiceSpec, error)
return nil, fmt.Errorf("unknown task runtime type: %s", t.Generic.Payload.TypeUrl) return nil, fmt.Errorf("unknown task runtime type: %s", t.Generic.Payload.TypeUrl)
} }
taskTemplate.RuntimeData = t.Generic.Payload.Value
default: default:
return nil, fmt.Errorf("error creating service; unsupported runtime %T", t) return nil, fmt.Errorf("error creating service; unsupported runtime %T", t)
} }
@ -176,7 +175,6 @@ func ServiceSpecToGRPC(s types.ServiceSpec) (swarmapi.ServiceSpec, error) {
Kind: string(types.RuntimePlugin), Kind: string(types.RuntimePlugin),
Payload: &gogotypes.Any{ Payload: &gogotypes.Any{
TypeUrl: string(types.RuntimeURLPlugin), TypeUrl: string(types.RuntimeURLPlugin),
Value: s.TaskTemplate.RuntimeData,
}, },
}, },
} }