Skip to content

Commit

Permalink
Merge pull request #3173 from corhere/fix-swarmd-module-path
Browse files Browse the repository at this point in the history 
swarmd: remove /v2/ from module path
  • Loading branch information
@thaJeztah
thaJeztah committed Apr 15, 2024
2 parents f3ffc08 + 906172e commit c1c857e
Show file tree
Hide file tree
Showing 38 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion swarmd/cmd/swarm-rafttool/main.go
View file
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
@@ -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
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
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
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
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
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
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
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
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
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
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

0 comments on commit c1c857e

Please sign in to comment.