Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

swarmd: remove /v2/ from module path #3173

Merged
merged 1 commit into from
Apr 15, 2024
Merged

swarmd: remove /v2/ from module path #3173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion swarmd/cmd/swarm-rafttool/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"os"

"github.com/moby/swarmkit/v2/swarmd/internal/defaults"
"github.com/moby/swarmkit/swarmd/internal/defaults"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/cluster/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"text/tabwriter"

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/cluster/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"text/tabwriter"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/cluster/unlockkey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/manager/encryption"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/cluster/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"time"

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/cli"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/config/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io"
"os"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/config/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"text/tabwriter"

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/config/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/dustin/go-humanize"
gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/config/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
16 changes: 8 additions & 8 deletions swarmd/cmd/swarmctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package main
import (
"os"

"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/cluster"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/config"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/network"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/node"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/secret"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task"
"github.com/moby/swarmkit/v2/swarmd/internal/defaults"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/cluster"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/config"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/network"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/node"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/secret"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/service"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/task"
"github.com/moby/swarmkit/swarmd/internal/defaults"
"github.com/moby/swarmkit/v2/version"
"github.com/spf13/cobra"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/network/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net"
"strings"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/network/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"text/tabwriter"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/network/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"text/tabwriter"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/network/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/node/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"reflect"
"strings"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions swarmd/cmd/swarmctl/node/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"text/tabwriter"

"github.com/dustin/go-humanize"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/task"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/api/genericresource"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/node/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"text/tabwriter"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/node/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package node
import (
"errors"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/secret/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io"
"os"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/secret/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"text/tabwriter"

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/secret/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/dustin/go-humanize"
gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/secret/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions swarmd/cmd/swarmctl/service/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/service/flagparser"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service/flagparser"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/service/flagparser/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/service/flagparser/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
4 changes: 2 additions & 2 deletions swarmd/cmd/swarmctl/service/flagparser/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package flagparser

import (
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/network"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/network"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/service/flagparser/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions swarmd/cmd/swarmctl/service/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

"github.com/dustin/go-humanize"
gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/task"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/api/genericresource"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/service/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"text/tabwriter"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/service/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io"
"os"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/service/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions swarmd/cmd/swarmctl/service/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"reflect"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/service/flagparser"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service/flagparser"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/task/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"text/tabwriter"

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/task/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"text/tabwriter"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/task/print.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"text/tabwriter"

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
)

type tasksBySlot []*api.Task
Expand Down
2 changes: 1 addition & 1 deletion swarmd/cmd/swarmctl/task/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/moby/swarmkit/swarmd/cmd/swarmctl/common"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common"
"github.com/spf13/cobra"
)

Expand Down
Loading
Loading