mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
5479df79c7
As of now promoting (or demoting) a node that has its role left unchanged will always print a successful message. This PR fixes the issue by matching the behavior on swarmkit's swarmctl command and printing a message when desired role is the current role of the node. As a result this also avoids calling update when it is not necessary. Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
36 lines
989 B
Go
36 lines
989 B
Go
package node
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/api/client"
|
|
"github.com/docker/docker/cli"
|
|
"github.com/docker/engine-api/types/swarm"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
func newDemoteCommand(dockerCli *client.DockerCli) *cobra.Command {
|
|
return &cobra.Command{
|
|
Use: "demote NODE [NODE...]",
|
|
Short: "Demote one or more nodes from manager in the swarm",
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return runDemote(dockerCli, args)
|
|
},
|
|
}
|
|
}
|
|
|
|
func runDemote(dockerCli *client.DockerCli, nodes []string) error {
|
|
demote := func(node *swarm.Node) error {
|
|
if node.Spec.Role == swarm.NodeRoleWorker {
|
|
fmt.Fprintf(dockerCli.Out(), "Node %s is already a worker.\n", node.ID)
|
|
return errNoRoleChange
|
|
}
|
|
node.Spec.Role = swarm.NodeRoleWorker
|
|
return nil
|
|
}
|
|
success := func(nodeID string) {
|
|
fmt.Fprintf(dockerCli.Out(), "Manager %s demoted in the swarm.\n", nodeID)
|
|
}
|
|
return updateNodes(dockerCli, nodes, demote, success)
|
|
}
|