mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
a66e0dc349
This fix adds `--filter enabled=true` to `docker plugin ls`, as was specified in 28624. The related API and docs has been updated. An integration test has been added. This fix fixes 28624. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
195 lines
4.9 KiB
Go
195 lines
4.9 KiB
Go
package container
|
|
|
|
import (
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
"github.com/docker/docker/api/types/network"
|
|
executorpkg "github.com/docker/docker/daemon/cluster/executor"
|
|
clustertypes "github.com/docker/docker/daemon/cluster/provider"
|
|
networktypes "github.com/docker/libnetwork/types"
|
|
"github.com/docker/swarmkit/agent/exec"
|
|
"github.com/docker/swarmkit/agent/secrets"
|
|
"github.com/docker/swarmkit/api"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
type executor struct {
|
|
backend executorpkg.Backend
|
|
secrets exec.SecretsManager
|
|
}
|
|
|
|
// NewExecutor returns an executor from the docker client.
|
|
func NewExecutor(b executorpkg.Backend) exec.Executor {
|
|
return &executor{
|
|
backend: b,
|
|
secrets: secrets.NewManager(),
|
|
}
|
|
}
|
|
|
|
// Describe returns the underlying node description from the docker client.
|
|
func (e *executor) Describe(ctx context.Context) (*api.NodeDescription, error) {
|
|
info, err := e.backend.SystemInfo()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
plugins := map[api.PluginDescription]struct{}{}
|
|
addPlugins := func(typ string, names []string) {
|
|
for _, name := range names {
|
|
plugins[api.PluginDescription{
|
|
Type: typ,
|
|
Name: name,
|
|
}] = struct{}{}
|
|
}
|
|
}
|
|
|
|
// add v1 plugins
|
|
addPlugins("Volume", info.Plugins.Volume)
|
|
// Add builtin driver "overlay" (the only builtin multi-host driver) to
|
|
// the plugin list by default.
|
|
addPlugins("Network", append([]string{"overlay"}, info.Plugins.Network...))
|
|
addPlugins("Authorization", info.Plugins.Authorization)
|
|
|
|
// add v2 plugins
|
|
v2Plugins, err := e.backend.PluginManager().List(filters.NewArgs())
|
|
if err == nil {
|
|
for _, plgn := range v2Plugins {
|
|
for _, typ := range plgn.Config.Interface.Types {
|
|
if typ.Prefix != "docker" || !plgn.Enabled {
|
|
continue
|
|
}
|
|
plgnTyp := typ.Capability
|
|
if typ.Capability == "volumedriver" {
|
|
plgnTyp = "Volume"
|
|
} else if typ.Capability == "networkdriver" {
|
|
plgnTyp = "Network"
|
|
}
|
|
plugins[api.PluginDescription{
|
|
Type: plgnTyp,
|
|
Name: plgn.Name,
|
|
}] = struct{}{}
|
|
}
|
|
}
|
|
}
|
|
|
|
pluginFields := make([]api.PluginDescription, 0, len(plugins))
|
|
for k := range plugins {
|
|
pluginFields = append(pluginFields, k)
|
|
}
|
|
|
|
sort.Sort(sortedPlugins(pluginFields))
|
|
|
|
// parse []string labels into a map[string]string
|
|
labels := map[string]string{}
|
|
for _, l := range info.Labels {
|
|
stringSlice := strings.SplitN(l, "=", 2)
|
|
// this will take the last value in the list for a given key
|
|
// ideally, one shouldn't assign multiple values to the same key
|
|
if len(stringSlice) > 1 {
|
|
labels[stringSlice[0]] = stringSlice[1]
|
|
}
|
|
}
|
|
|
|
description := &api.NodeDescription{
|
|
Hostname: info.Name,
|
|
Platform: &api.Platform{
|
|
Architecture: info.Architecture,
|
|
OS: info.OSType,
|
|
},
|
|
Engine: &api.EngineDescription{
|
|
EngineVersion: info.ServerVersion,
|
|
Labels: labels,
|
|
Plugins: pluginFields,
|
|
},
|
|
Resources: &api.Resources{
|
|
NanoCPUs: int64(info.NCPU) * 1e9,
|
|
MemoryBytes: info.MemTotal,
|
|
},
|
|
}
|
|
|
|
return description, nil
|
|
}
|
|
|
|
func (e *executor) Configure(ctx context.Context, node *api.Node) error {
|
|
na := node.Attachment
|
|
if na == nil {
|
|
return nil
|
|
}
|
|
|
|
options := types.NetworkCreate{
|
|
Driver: na.Network.DriverState.Name,
|
|
IPAM: &network.IPAM{
|
|
Driver: na.Network.IPAM.Driver.Name,
|
|
},
|
|
Options: na.Network.DriverState.Options,
|
|
CheckDuplicate: true,
|
|
}
|
|
|
|
for _, ic := range na.Network.IPAM.Configs {
|
|
c := network.IPAMConfig{
|
|
Subnet: ic.Subnet,
|
|
IPRange: ic.Range,
|
|
Gateway: ic.Gateway,
|
|
}
|
|
options.IPAM.Config = append(options.IPAM.Config, c)
|
|
}
|
|
|
|
return e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
|
|
ID: na.Network.ID,
|
|
NetworkCreateRequest: types.NetworkCreateRequest{
|
|
Name: na.Network.Spec.Annotations.Name,
|
|
NetworkCreate: options,
|
|
},
|
|
}, na.Addresses[0])
|
|
}
|
|
|
|
// Controller returns a docker container runner.
|
|
func (e *executor) Controller(t *api.Task) (exec.Controller, error) {
|
|
if t.Spec.GetAttachment() != nil {
|
|
return newNetworkAttacherController(e.backend, t, e.secrets)
|
|
}
|
|
|
|
ctlr, err := newController(e.backend, t, e.secrets)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return ctlr, nil
|
|
}
|
|
|
|
func (e *executor) SetNetworkBootstrapKeys(keys []*api.EncryptionKey) error {
|
|
nwKeys := []*networktypes.EncryptionKey{}
|
|
for _, key := range keys {
|
|
nwKey := &networktypes.EncryptionKey{
|
|
Subsystem: key.Subsystem,
|
|
Algorithm: int32(key.Algorithm),
|
|
Key: make([]byte, len(key.Key)),
|
|
LamportTime: key.LamportTime,
|
|
}
|
|
copy(nwKey.Key, key.Key)
|
|
nwKeys = append(nwKeys, nwKey)
|
|
}
|
|
e.backend.SetNetworkBootstrapKeys(nwKeys)
|
|
|
|
return nil
|
|
}
|
|
|
|
func (e *executor) Secrets() exec.SecretsManager {
|
|
return e.secrets
|
|
}
|
|
|
|
type sortedPlugins []api.PluginDescription
|
|
|
|
func (sp sortedPlugins) Len() int { return len(sp) }
|
|
|
|
func (sp sortedPlugins) Swap(i, j int) { sp[i], sp[j] = sp[j], sp[i] }
|
|
|
|
func (sp sortedPlugins) Less(i, j int) bool {
|
|
if sp[i].Type != sp[j].Type {
|
|
return sp[i].Type < sp[j].Type
|
|
}
|
|
return sp[i].Name < sp[j].Name
|
|
}
|