github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Make api a Go sub-module

Browse Source 
Allow the api to stay at the same v1 go package name and keep using a
1.x version number. This indicates the API is still at 1.x and allows
sharing proto types with containerd 1.6 and 1.7 releases.

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-04-29 16:06:34 -07:00
parent e1b94c0e7d
commit 2ac2b9c909
371 changed files with 42158 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/containerd-shim-runc-v2/manager/manager_linux.go
View File

@@ -33,8 +33,8 @@ import (
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/core/mount"

4
cmd/containerd-shim-runc-v2/runc/container.go
View File

@@ -30,8 +30,8 @@ import (
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/namespaces"

8
cmd/containerd-shim-runc-v2/task/service.go
View File

@@ -27,10 +27,10 @@ import (
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
eventstypes "github.com/containerd/containerd/v2/api/events"
taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/v2/api/types/task"
eventstypes "github.com/containerd/containerd/api/events"
taskAPI "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/core/runtime"

2
cmd/containerd/builtins/builtins_linux.go
View File

@@ -17,7 +17,7 @@
package builtins
import (
_ "github.com/containerd/containerd/v2/api/types/runc/options"
_ "github.com/containerd/containerd/api/types/runc/options"
_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"

2
cmd/containerd/command/publish.go
View File

@@ -24,7 +24,7 @@ import (
"os"
"time"
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"

6
cmd/containerd/server/server.go
View File

@@ -46,9 +46,9 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
diffapi "github.com/containerd/containerd/api/services/diff/v1"
sbapi "github.com/containerd/containerd/api/services/sandbox/v1"
ssapi "github.com/containerd/containerd/api/services/snapshots/v1"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
csproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/diff"

4
cmd/ctr/commands/commands_unix.go
View File

@@ -21,8 +21,8 @@ package commands
import (
"errors"
"github.com/containerd/containerd/v2/api/types/runc/options"
runtimeoptions "github.com/containerd/containerd/v2/api/types/runtimeoptions/v1"
"github.com/containerd/containerd/api/types/runc/options"
runtimeoptions "github.com/containerd/containerd/api/types/runtimeoptions/v1"
"github.com/urfave/cli/v2"
)

2
cmd/ctr/commands/deprecations/deprecations.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/urfave/cli/v2"
api "github.com/containerd/containerd/v2/api/services/introspection/v1"
api "github.com/containerd/containerd/api/services/introspection/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/protobuf"
)

2
cmd/ctr/commands/events/events.go
View File

@@ -27,7 +27,7 @@ import (
"github.com/urfave/cli/v2"
// Register grpc event types
_ "github.com/containerd/containerd/v2/api/events"
_ "github.com/containerd/containerd/api/events"
)
// Command is the cli command for displaying containerd events

2
cmd/ctr/commands/info/info.go
View File

@@ -17,7 +17,7 @@
package info
import (
api "github.com/containerd/containerd/v2/api/services/introspection/v1"
api "github.com/containerd/containerd/api/services/introspection/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli/v2"
)

2
cmd/ctr/commands/plugins/plugins.go
View File

@@ -24,7 +24,7 @@ import (
"strings"
"text/tabwriter"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/platforms"
pluginutils "github.com/containerd/plugin"

2
cmd/ctr/commands/shim/shim.go
View File

@@ -28,7 +28,7 @@ import (
"strings"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/api/runtime/task/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/namespaces"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"

2
cmd/ctr/commands/tasks/checkpoint.go
View File

@@ -20,7 +20,7 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/api/types/runc/options"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli/v2"

2
cmd/ctr/commands/tasks/list.go
View File

@@ -21,7 +21,7 @@ import (
"os"
"text/tabwriter"
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
tasks "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli/v2"
)