Skip to content

Commit c6d43d3

Browse files
corherecorhere
committed
cmd: move swarmd commands to swarmd/cmd/...
Signed-off-by: Cory Snider <[email protected]>
1 parent dcda100 commit c6d43d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+50
-50
lines changed

‎direct.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PACKAGES = $(shell go list ./...)
1212
INTEGRATION_PACKAGE = $(shell go list ./integration)
1313

1414
# Project binaries.
15-
COMMANDS=swarmd swarmctl swarm-bench swarm-rafttool protoc-gen-gogoswarm
15+
COMMANDS=swarm-bench protoc-gen-gogoswarm
1616
BINARIES=$(addprefix bin/,$(COMMANDS))
1717

1818
GO_LDFLAGS=-ldflags "-X `go list ./version`.Version=$(VERSION)"

‎cmd/external-ca-example/README.md ‎swarmd/cmd/external-ca-example/README.md

‎cmd/external-ca-example/main.go ‎swarmd/cmd/external-ca-example/main.go

File renamed without changes.

‎cmd/swarm-rafttool/common.go ‎swarmd/cmd/swarm-rafttool/common.go

File renamed without changes.

‎cmd/swarm-rafttool/common_test.go ‎swarmd/cmd/swarm-rafttool/common_test.go

File renamed without changes.

‎cmd/swarm-rafttool/dump.go ‎swarmd/cmd/swarm-rafttool/dump.go

File renamed without changes.

‎cmd/swarm-rafttool/main.go ‎swarmd/cmd/swarm-rafttool/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"os"
77

8-
"github.com/moby/swarmkit/v2/cmd/swarmd/defaults"
8+
"github.com/moby/swarmkit/v2/swarmd/internal/defaults"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarm-rafttool/renewcert.go ‎swarmd/cmd/swarm-rafttool/renewcert.go

File renamed without changes.

‎cmd/swarmctl/cluster/cmd.go ‎swarmd/cmd/swarmctl/cluster/cmd.go

File renamed without changes.

‎cmd/swarmctl/cluster/common.go ‎swarmd/cmd/swarmctl/cluster/common.go

File renamed without changes.

‎cmd/swarmctl/cluster/inspect.go ‎swarmd/cmd/swarmctl/cluster/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
gogotypes "github.com/gogo/protobuf/types"
1111
"github.com/moby/swarmkit/v2/api"
12-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
12+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1313
"github.com/spf13/cobra"
1414
)
1515

‎cmd/swarmctl/cluster/list.go ‎swarmd/cmd/swarmctl/cluster/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/cluster/unlockkey.go ‎swarmd/cmd/swarmctl/cluster/unlockkey.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
98
"github.com/moby/swarmkit/v2/manager/encryption"
9+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1010
"github.com/spf13/cobra"
1111
)
1212

‎cmd/swarmctl/cluster/update.go ‎swarmd/cmd/swarmctl/cluster/update.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
gogotypes "github.com/gogo/protobuf/types"
1010
"github.com/moby/swarmkit/v2/api"
1111
"github.com/moby/swarmkit/v2/cli"
12-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
12+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1313
"github.com/spf13/cobra"
1414
)
1515

‎cmd/swarmctl/common/common.go ‎swarmd/cmd/swarmctl/common/common.go

File renamed without changes.

‎cmd/swarmctl/common/print.go ‎swarmd/cmd/swarmctl/common/print.go

File renamed without changes.

‎cmd/swarmctl/common/resolver.go ‎swarmd/cmd/swarmctl/common/resolver.go

File renamed without changes.

‎cmd/swarmctl/config/cmd.go ‎swarmd/cmd/swarmctl/config/cmd.go

File renamed without changes.

‎cmd/swarmctl/config/common.go ‎swarmd/cmd/swarmctl/config/common.go

File renamed without changes.

‎cmd/swarmctl/config/create.go ‎swarmd/cmd/swarmctl/config/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/config/inspect.go ‎swarmd/cmd/swarmctl/config/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
gogotypes "github.com/gogo/protobuf/types"
1010
"github.com/moby/swarmkit/v2/api"
11-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
11+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1212
"github.com/spf13/cobra"
1313
)
1414

‎cmd/swarmctl/config/list.go ‎swarmd/cmd/swarmctl/config/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/dustin/go-humanize"
1111
gogotypes "github.com/gogo/protobuf/types"
1212
"github.com/moby/swarmkit/v2/api"
13-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
13+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1414
"github.com/spf13/cobra"
1515
)
1616

‎cmd/swarmctl/config/remove.go ‎swarmd/cmd/swarmctl/config/remove.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmctl/main.go ‎swarmd/cmd/swarmctl/main.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package main
33
import (
44
"os"
55

6-
"github.com/moby/swarmkit/v2/cmd/swarmctl/cluster"
7-
"github.com/moby/swarmkit/v2/cmd/swarmctl/config"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/network"
9-
"github.com/moby/swarmkit/v2/cmd/swarmctl/node"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/secret"
11-
"github.com/moby/swarmkit/v2/cmd/swarmctl/service"
12-
"github.com/moby/swarmkit/v2/cmd/swarmctl/task"
13-
"github.com/moby/swarmkit/v2/cmd/swarmd/defaults"
6+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/cluster"
7+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/config"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/network"
9+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/node"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/secret"
11+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service"
12+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task"
13+
"github.com/moby/swarmkit/v2/swarmd/internal/defaults"
1414
"github.com/moby/swarmkit/v2/version"
1515
"github.com/spf13/cobra"
1616
"google.golang.org/grpc/status"

‎cmd/swarmctl/network/cmd.go ‎swarmd/cmd/swarmctl/network/cmd.go

File renamed without changes.

‎cmd/swarmctl/network/common.go ‎swarmd/cmd/swarmctl/network/common.go

File renamed without changes.

‎cmd/swarmctl/network/create.go ‎swarmd/cmd/swarmctl/network/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/network/inspect.go ‎swarmd/cmd/swarmctl/network/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/network/list.go ‎swarmd/cmd/swarmctl/network/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/network/remove.go ‎swarmd/cmd/swarmctl/network/remove.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmctl/node/activate.go ‎swarmd/cmd/swarmctl/node/activate.go

File renamed without changes.

‎cmd/swarmctl/node/cmd.go ‎swarmd/cmd/swarmctl/node/cmd.go

File renamed without changes.

‎cmd/swarmctl/node/common.go ‎swarmd/cmd/swarmctl/node/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99

1010
"github.com/moby/swarmkit/v2/api"
11-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
11+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1212
"github.com/spf13/cobra"
1313
)
1414

‎cmd/swarmctl/node/demote.go ‎swarmd/cmd/swarmctl/node/demote.go

File renamed without changes.

‎cmd/swarmctl/node/drain.go ‎swarmd/cmd/swarmctl/node/drain.go

File renamed without changes.

‎cmd/swarmctl/node/inspect.go ‎swarmd/cmd/swarmctl/node/inspect.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/dustin/go-humanize"
1111
"github.com/moby/swarmkit/v2/api"
1212
"github.com/moby/swarmkit/v2/api/genericresource"
13-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
14-
"github.com/moby/swarmkit/v2/cmd/swarmctl/task"
13+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
14+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task"
1515
"github.com/spf13/cobra"
1616
)
1717

‎cmd/swarmctl/node/list.go ‎swarmd/cmd/swarmctl/node/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/node/pause.go ‎swarmd/cmd/swarmctl/node/pause.go

File renamed without changes.

‎cmd/swarmctl/node/promote.go ‎swarmd/cmd/swarmctl/node/promote.go

File renamed without changes.

‎cmd/swarmctl/node/remove.go ‎swarmd/cmd/swarmctl/node/remove.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55

66
"github.com/moby/swarmkit/v2/api"
7-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
7+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
88
"github.com/spf13/cobra"
99
)
1010

‎cmd/swarmctl/node/update.go ‎swarmd/cmd/swarmctl/node/update.go

File renamed without changes.

‎cmd/swarmctl/secret/cmd.go ‎swarmd/cmd/swarmctl/secret/cmd.go

File renamed without changes.

‎cmd/swarmctl/secret/common.go ‎swarmd/cmd/swarmctl/secret/common.go

File renamed without changes.

‎cmd/swarmctl/secret/create.go ‎swarmd/cmd/swarmctl/secret/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/secret/inspect.go ‎swarmd/cmd/swarmctl/secret/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
gogotypes "github.com/gogo/protobuf/types"
1010
"github.com/moby/swarmkit/v2/api"
11-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
11+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1212
"github.com/spf13/cobra"
1313
)
1414

‎cmd/swarmctl/secret/list.go ‎swarmd/cmd/swarmctl/secret/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/dustin/go-humanize"
1111
gogotypes "github.com/gogo/protobuf/types"
1212
"github.com/moby/swarmkit/v2/api"
13-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
13+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1414
"github.com/spf13/cobra"
1515
)
1616

‎cmd/swarmctl/secret/remove.go ‎swarmd/cmd/swarmctl/secret/remove.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmctl/service/cmd.go ‎swarmd/cmd/swarmctl/service/cmd.go

File renamed without changes.

‎cmd/swarmctl/service/common.go ‎swarmd/cmd/swarmctl/service/common.go

File renamed without changes.

‎cmd/swarmctl/service/create.go ‎swarmd/cmd/swarmctl/service/create.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
9-
"github.com/moby/swarmkit/v2/cmd/swarmctl/service/flagparser"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
9+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service/flagparser"
1010
"github.com/spf13/cobra"
1111
)
1212

‎cmd/swarmctl/service/flagparser/bind.go ‎swarmd/cmd/swarmctl/service/flagparser/bind.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/capability.go ‎swarmd/cmd/swarmctl/service/flagparser/capability.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/config.go ‎swarmd/cmd/swarmctl/service/flagparser/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmctl/service/flagparser/container.go ‎swarmd/cmd/swarmctl/service/flagparser/container.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/flags.go ‎swarmd/cmd/swarmctl/service/flagparser/flags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
"github.com/spf13/pflag"
1111
)

‎cmd/swarmctl/service/flagparser/mode.go ‎swarmd/cmd/swarmctl/service/flagparser/mode.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/network.go ‎swarmd/cmd/swarmctl/service/flagparser/network.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package flagparser
22

33
import (
44
"github.com/moby/swarmkit/v2/api"
5-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
6-
"github.com/moby/swarmkit/v2/cmd/swarmctl/network"
5+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
6+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/network"
77
"github.com/spf13/cobra"
88
)
99

‎cmd/swarmctl/service/flagparser/npipe.go ‎swarmd/cmd/swarmctl/service/flagparser/npipe.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/placement.go ‎swarmd/cmd/swarmctl/service/flagparser/placement.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/port.go ‎swarmd/cmd/swarmctl/service/flagparser/port.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/resource.go ‎swarmd/cmd/swarmctl/service/flagparser/resource.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/restart.go ‎swarmd/cmd/swarmctl/service/flagparser/restart.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/secret.go ‎swarmd/cmd/swarmctl/service/flagparser/secret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmctl/service/flagparser/tmpfs.go ‎swarmd/cmd/swarmctl/service/flagparser/tmpfs.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/update.go ‎swarmd/cmd/swarmctl/service/flagparser/update.go

File renamed without changes.

‎cmd/swarmctl/service/flagparser/volume.go ‎swarmd/cmd/swarmctl/service/flagparser/volume.go

File renamed without changes.

‎cmd/swarmctl/service/inspect.go ‎swarmd/cmd/swarmctl/service/inspect.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
gogotypes "github.com/gogo/protobuf/types"
1414
"github.com/moby/swarmkit/v2/api"
1515
"github.com/moby/swarmkit/v2/api/genericresource"
16-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
17-
"github.com/moby/swarmkit/v2/cmd/swarmctl/task"
16+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
17+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task"
1818
"github.com/spf13/cobra"
1919
)
2020

‎cmd/swarmctl/service/list.go ‎swarmd/cmd/swarmctl/service/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/service/logs.go ‎swarmd/cmd/swarmctl/service/logs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/pkg/errors"
1212
"github.com/spf13/cobra"
1313
)

‎cmd/swarmctl/service/remove.go ‎swarmd/cmd/swarmctl/service/remove.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmctl/service/update.go ‎swarmd/cmd/swarmctl/service/update.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"reflect"
77

88
"github.com/moby/swarmkit/v2/api"
9-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/service/flagparser"
9+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service/flagparser"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/task/cmd.go ‎swarmd/cmd/swarmctl/task/cmd.go

File renamed without changes.

‎cmd/swarmctl/task/inspect.go ‎swarmd/cmd/swarmctl/task/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
gogotypes "github.com/gogo/protobuf/types"
1212
"github.com/moby/swarmkit/v2/api"
13-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
13+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1414
"github.com/spf13/cobra"
1515
)
1616

‎cmd/swarmctl/task/list.go ‎swarmd/cmd/swarmctl/task/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"text/tabwriter"
88

99
"github.com/moby/swarmkit/v2/api"
10-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
10+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/swarmctl/task/print.go ‎swarmd/cmd/swarmctl/task/print.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
gogotypes "github.com/gogo/protobuf/types"
1010
"github.com/moby/swarmkit/v2/api"
11-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
11+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
1212
)
1313

1414
type tasksBySlot []*api.Task

‎cmd/swarmctl/task/remove.go ‎swarmd/cmd/swarmctl/task/remove.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/moby/swarmkit/v2/api"
8-
"github.com/moby/swarmkit/v2/cmd/swarmctl/common"
8+
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/swarmd/main.go ‎swarmd/cmd/swarmd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"github.com/moby/swarmkit/v2/api"
1717
"github.com/moby/swarmkit/v2/api/genericresource"
1818
"github.com/moby/swarmkit/v2/cli"
19-
"github.com/moby/swarmkit/v2/cmd/swarmd/defaults"
2019
"github.com/moby/swarmkit/v2/log"
2120
"github.com/moby/swarmkit/v2/manager/encryption"
2221
"github.com/moby/swarmkit/v2/node"
22+
"github.com/moby/swarmkit/v2/swarmd/internal/defaults"
2323
"github.com/moby/swarmkit/v2/version"
2424
"github.com/prometheus/client_golang/prometheus/promhttp"
2525
"github.com/sirupsen/logrus"

‎cmd/swarmd/defaults/defaults_unix.go ‎swarmd/internal/defaults/defaults_unix.go

File renamed without changes.

‎cmd/swarmd/defaults/defaults_windows.go ‎swarmd/internal/defaults/defaults_windows.go

File renamed without changes.

0 commit comments

Comments
 (0)