0adaf6be3b
This replaces the visitAll recursive function with a test that verifies that the option is set for all commands and subcommands, so that it doesn't have to be modified at runtime. We currently still have to loop over all functions for the setValidateArgs call, but that can be looked at separately. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
93 lines
2.8 KiB
Go
93 lines
2.8 KiB
Go
package swarm
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/moby/moby/api/types/swarm"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
type joinOptions struct {
|
|
remote string
|
|
listenAddr NodeAddrOption
|
|
// Not a NodeAddrOption because it has no default port.
|
|
advertiseAddr string
|
|
dataPathAddr string
|
|
token string
|
|
availability string
|
|
}
|
|
|
|
func newJoinCommand(dockerCLI command.Cli) *cobra.Command {
|
|
opts := joinOptions{
|
|
listenAddr: NewListenAddrOption(),
|
|
}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "join [OPTIONS] HOST:PORT",
|
|
Short: "Join a swarm as a node and/or manager",
|
|
Args: cli.ExactArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.remote = args[0]
|
|
return runJoin(cmd.Context(), dockerCLI, cmd.Flags(), opts)
|
|
},
|
|
Annotations: map[string]string{
|
|
"version": "1.24",
|
|
"swarm": "", // swarm join does not require swarm to be active, and is always available on API 1.24 and up
|
|
},
|
|
DisableFlagsInUseLine: true,
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.Var(&opts.listenAddr, flagListenAddr, `Listen address (format: "<ip|interface>[:port]")`)
|
|
flags.StringVar(&opts.advertiseAddr, flagAdvertiseAddr, "", `Advertised address (format: "<ip|interface>[:port]")`)
|
|
flags.StringVar(&opts.dataPathAddr, flagDataPathAddr, "", `Address or interface to use for data path traffic (format: "<ip|interface>")`)
|
|
flags.SetAnnotation(flagDataPathAddr, "version", []string{"1.31"})
|
|
flags.StringVar(&opts.token, flagToken, "", "Token for entry into the swarm")
|
|
flags.StringVar(&opts.availability, flagAvailability, "active", `Availability of the node ("active", "pause", "drain")`)
|
|
return cmd
|
|
}
|
|
|
|
func runJoin(ctx context.Context, dockerCLI command.Cli, flags *pflag.FlagSet, opts joinOptions) error {
|
|
apiClient := dockerCLI.Client()
|
|
|
|
req := swarm.JoinRequest{
|
|
JoinToken: opts.token,
|
|
ListenAddr: opts.listenAddr.String(),
|
|
AdvertiseAddr: opts.advertiseAddr,
|
|
DataPathAddr: opts.dataPathAddr,
|
|
RemoteAddrs: []string{opts.remote},
|
|
}
|
|
if flags.Changed(flagAvailability) {
|
|
availability := swarm.NodeAvailability(strings.ToLower(opts.availability))
|
|
switch availability {
|
|
case swarm.NodeAvailabilityActive, swarm.NodeAvailabilityPause, swarm.NodeAvailabilityDrain:
|
|
req.Availability = availability
|
|
default:
|
|
return errors.Errorf("invalid availability %q, only active, pause and drain are supported", opts.availability)
|
|
}
|
|
}
|
|
|
|
err := apiClient.SwarmJoin(ctx, req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
info, err := apiClient.Info(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if info.Swarm.ControlAvailable {
|
|
_, _ = fmt.Fprintln(dockerCLI.Out(), "This node joined a swarm as a manager.")
|
|
} else {
|
|
_, _ = fmt.Fprintln(dockerCLI.Out(), "This node joined a swarm as a worker.")
|
|
}
|
|
return nil
|
|
}
|