updates for review comments
- runtimeUrl -> type_url - runtimes -> runtime Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
parent
f71bdc67a2
commit
8c2c69d31e
|
@ -46,7 +46,7 @@ func runList(dockerCli *command.DockerCli, opts listOptions) error {
|
||||||
client := dockerCli.Client()
|
client := dockerCli.Client()
|
||||||
|
|
||||||
serviceFilters := opts.filter.Value()
|
serviceFilters := opts.filter.Value()
|
||||||
serviceFilters.Add("runtimes", string(swarm.RuntimeContainer))
|
serviceFilters.Add("runtime", string(swarm.RuntimeContainer))
|
||||||
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceFilters})
|
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceFilters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -61,9 +61,9 @@ func runPS(dockerCli *command.DockerCli, opts psOptions) error {
|
||||||
for _, service := range opts.services {
|
for _, service := range opts.services {
|
||||||
// default to container runtime
|
// default to container runtime
|
||||||
serviceIDFilter.Add("id", service)
|
serviceIDFilter.Add("id", service)
|
||||||
serviceIDFilter.Add("runtimes", string(swarmtypes.RuntimeContainer))
|
serviceIDFilter.Add("runtime", string(swarmtypes.RuntimeContainer))
|
||||||
serviceNameFilter.Add("name", service)
|
serviceNameFilter.Add("name", service)
|
||||||
serviceNameFilter.Add("runtimes", string(swarmtypes.RuntimeContainer))
|
serviceNameFilter.Add("runtime", string(swarmtypes.RuntimeContainer))
|
||||||
}
|
}
|
||||||
serviceByIDList, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceIDFilter})
|
serviceByIDList, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceIDFilter})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -19,7 +19,7 @@ func getStackFilter(namespace string) filters.Args {
|
||||||
|
|
||||||
func getServiceFilter(namespace string) filters.Args {
|
func getServiceFilter(namespace string) filters.Args {
|
||||||
filter := getStackFilter(namespace)
|
filter := getStackFilter(namespace)
|
||||||
filter.Add("runtimes", string(swarm.RuntimeContainer))
|
filter.Add("runtime", string(swarm.RuntimeContainer))
|
||||||
return filter
|
return filter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,8 +85,8 @@ func serviceSpecFromGRPC(spec *swarmapi.ServiceSpec) (*types.ServiceSpec, error)
|
||||||
taskTemplate.ContainerSpec = containerSpecFromGRPC(containerConfig)
|
taskTemplate.ContainerSpec = containerSpecFromGRPC(containerConfig)
|
||||||
taskTemplate.Runtime = types.RuntimeContainer
|
taskTemplate.Runtime = types.RuntimeContainer
|
||||||
case *swarmapi.TaskSpec_Generic:
|
case *swarmapi.TaskSpec_Generic:
|
||||||
switch t.Generic.Payload.TypeUrl {
|
switch t.Generic.Kind {
|
||||||
case string(types.RuntimeURLPlugin):
|
case string(types.RuntimePlugin):
|
||||||
taskTemplate.Runtime = types.RuntimePlugin
|
taskTemplate.Runtime = types.RuntimePlugin
|
||||||
default:
|
default:
|
||||||
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)
|
||||||
|
|
|
@ -166,7 +166,7 @@ func (e *executor) Controller(t *api.Task) (exec.Controller, error) {
|
||||||
case *api.TaskSpec_Generic:
|
case *api.TaskSpec_Generic:
|
||||||
logrus.WithFields(logrus.Fields{
|
logrus.WithFields(logrus.Fields{
|
||||||
"kind": r.Generic.Kind,
|
"kind": r.Generic.Kind,
|
||||||
"runtimeUrl": r.Generic.Payload.TypeUrl,
|
"type_url": r.Generic.Payload.TypeUrl,
|
||||||
}).Debug("custom runtime requested")
|
}).Debug("custom runtime requested")
|
||||||
runtimeKind, err := naming.Runtime(t.Spec)
|
runtimeKind, err := naming.Runtime(t.Spec)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -44,7 +44,7 @@ func (c *Cluster) GetServices(options apitypes.ServiceListOptions) ([]types.Serv
|
||||||
"id": true,
|
"id": true,
|
||||||
"label": true,
|
"label": true,
|
||||||
"mode": true,
|
"mode": true,
|
||||||
"runtimes": true,
|
"runtime": true,
|
||||||
}
|
}
|
||||||
if err := options.Filters.Validate(accepted); err != nil {
|
if err := options.Filters.Validate(accepted); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -54,7 +54,7 @@ func (c *Cluster) GetServices(options apitypes.ServiceListOptions) ([]types.Serv
|
||||||
NamePrefixes: options.Filters.Get("name"),
|
NamePrefixes: options.Filters.Get("name"),
|
||||||
IDPrefixes: options.Filters.Get("id"),
|
IDPrefixes: options.Filters.Get("id"),
|
||||||
Labels: runconfigopts.ConvertKVStringsToMap(options.Filters.Get("label")),
|
Labels: runconfigopts.ConvertKVStringsToMap(options.Filters.Get("label")),
|
||||||
Runtimes: options.Filters.Get("runtimes"),
|
Runtimes: options.Filters.Get("runtime"),
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, cancel := c.getRequestContext()
|
ctx, cancel := c.getRequestContext()
|
||||||
|
|
Loading…
Reference in New Issue