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

2
integration/build_local_containerd_helper_test.go
View File

@@ -34,7 +34,7 @@ import (
"github.com/containerd/plugin"
"github.com/opencontainers/go-digest"
_ "github.com/containerd/containerd/v2/api/types/runc/options"
_ "github.com/containerd/containerd/api/types/runc/options"
_ "github.com/containerd/containerd/v2/core/runtime/v2"
_ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/plugins/cri/runtime"

4
integration/client/client_ttrpc_test.go
View File

@@ -21,8 +21,8 @@ import (
"testing"
"time"
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1"
apitypes "github.com/containerd/containerd/v2/api/types"
v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
apitypes "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/protobuf/types"

2
integration/client/container_linux_test.go
View File

@@ -34,7 +34,7 @@ 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/runc/options"
"github.com/containerd/containerd/api/types/runc/options"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/pkg/cio"

4
integration/client/container_test.go
View File

@@ -31,8 +31,8 @@ import (
"testing"
"time"
apievents "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/api/types/runc/options"
apievents "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/runc/options"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/images"

2
integration/client/daemon_config_linux_test.go
View File

@@ -27,7 +27,7 @@ import (
"time"
"github.com/containerd/cgroups/v3"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/api/types/runc/options"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/plugins"

2
integration/client/restart_monitor_test.go
View File

@@ -31,7 +31,7 @@ import (
"testing"
"time"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
. "github.com/containerd/containerd/v2/client"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/core/runtime/restart"

2
integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go
View File

@@ -23,7 +23,7 @@ import (
"path/filepath"
"strings"
taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3"
taskapi "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task"
"github.com/containerd/containerd/v2/internal/failpoint"
"github.com/containerd/containerd/v2/pkg/oci"

2
integration/issue7496_linux_test.go
View File

@@ -29,7 +29,7 @@ import (
"testing"
"time"
apitask "github.com/containerd/containerd/v2/api/runtime/task/v3"
apitask "github.com/containerd/containerd/api/runtime/task/v3"
shimcore "github.com/containerd/containerd/v2/core/runtime/v2"
"github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/pkg/namespaces"

2
integration/issue7496_shutdown_linux_test.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/require"
apitask "github.com/containerd/containerd/v2/api/runtime/task/v3"
apitask "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/v2/pkg/namespaces"
)