From 8eeba751983d6499a07fcd21c26f381eb1d17d19 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Fri, 19 May 2017 17:10:32 -0400 Subject: [PATCH] remove RuntimeData from cluster and types Signed-off-by: Evan Hazlett --- api/swagger.yaml | 3 --- api/types/swarm/task.go | 3 --- daemon/cluster/convert/service.go | 2 -- 3 files changed, 8 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index 4bce7d6610..1ba9c5874c 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -2174,9 +2174,6 @@ definitions: Runtime: description: "Runtime is the type of runtime specified for the task executor." type: "string" - RuntimeData: - description: "RuntimeData is the payload sent to be used with the runtime for the executor." - type: "array" Networks: type: "array" items: diff --git a/api/types/swarm/task.go b/api/types/swarm/task.go index 9fd52e47d0..a598a79d59 100644 --- a/api/types/swarm/task.go +++ b/api/types/swarm/task.go @@ -67,9 +67,6 @@ type TaskSpec struct { ForceUpdate uint64 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). diff --git a/daemon/cluster/convert/service.go b/daemon/cluster/convert/service.go index 2604259b24..3ab212927c 100644 --- a/daemon/cluster/convert/service.go +++ b/daemon/cluster/convert/service.go @@ -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) } - taskTemplate.RuntimeData = t.Generic.Payload.Value default: 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), Payload: &gogotypes.Any{ TypeUrl: string(types.RuntimeURLPlugin), - Value: s.TaskTemplate.RuntimeData, }, }, }