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

Move sandbox to core/sandbox

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:52:39 -08:00
parent d133019c9b
commit 228ad5a5ca
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
29 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client.go
View File

@ -47,6 +47,8 @@ import (
leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/sandbox"
sandboxproxy "github.com/containerd/containerd/v2/core/sandbox/proxy"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
@ -55,8 +57,6 @@ import (
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/sandbox"
sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy"
"github.com/containerd/containerd/v2/services/introspection"
"github.com/containerd/containerd/v2/snapshots"
snproxy "github.com/containerd/containerd/v2/snapshots/proxy"

2
client/sandbox.go
View File

@ -23,10 +23,10 @@ import (
"time"
"github.com/containerd/containerd/v2/core/containers"
api "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/protobuf/types"
api "github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/typeurl/v2"
)

2
client/services.go
View File

@ -29,9 +29,9 @@ import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/sandbox"
srv "github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/services/introspection"
"github.com/containerd/containerd/v2/snapshots"

2
core/metadata/adaptors.go
View File

@ -23,8 +23,8 @@ import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/containerd/v2/snapshots"
)

2
core/metadata/sandbox.go
View File

@ -24,11 +24,11 @@ import (
"time"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
api "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/identifiers"
"github.com/containerd/containerd/v2/namespaces"
api "github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/typeurl/v2"
"go.etcd.io/bbolt"
)

2
core/metadata/sandbox_test.go
View File

@ -19,9 +19,9 @@ package metadata
import (
"testing"
api "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/protobuf/types"
api "github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/typeurl/v2"
"github.com/google/go-cmp/cmp"
)

0
sandbox/bridge.go → core/sandbox/bridge.go
View File

0
sandbox/controller.go → core/sandbox/controller.go
View File

0
sandbox/helpers.go → core/sandbox/helpers.go
View File

2
sandbox/proxy/controller.go → core/sandbox/proxy/controller.go
View File

@ -22,9 +22,9 @@ import (
api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/sandbox"
"google.golang.org/protobuf/types/known/anypb"
)

2
sandbox/proxy/store.go → core/sandbox/proxy/store.go
View File

@ -20,8 +20,8 @@ import (
"context"
api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
sb "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
sb "github.com/containerd/containerd/v2/sandbox"
)
// remoteSandboxStore is a low-level containerd client to manage sandbox environments metadata

0
sandbox/store.go → core/sandbox/store.go
View File

0
sandbox/store_test.go → core/sandbox/store_test.go
View File

2
pkg/cri/cri.go
View File

@ -25,6 +25,7 @@ import (
"github.com/containerd/plugin/registry"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/pkg/cri/instrument"
@ -34,7 +35,6 @@ import (
nriservice "github.com/containerd/containerd/v2/pkg/nri"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/sandbox"
"google.golang.org/grpc"

2
pkg/cri/server/podsandbox/controller.go
View File

@ -28,6 +28,7 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
@ -40,7 +41,6 @@ import (
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/sandbox"
)
func init() {

2
pkg/cri/server/podsandbox/recover.go
View File

@ -26,12 +26,12 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerd "github.com/containerd/containerd/v2/client"
sandbox2 "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/containerd/v2/pkg/netns"
sandbox2 "github.com/containerd/containerd/v2/sandbox"
)
// loadContainerTimeout is the default timeout for loading a container/sandbox.

2
pkg/cri/server/podsandbox/sandbox_run.go
View File

@ -31,6 +31,7 @@ import (
containerdio "github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
@ -39,7 +40,6 @@ import (
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/containerd/v2/snapshots"
)

2
pkg/cri/server/podsandbox/sandbox_status.go
View File

@ -25,10 +25,10 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cri/server/base"
"github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types"
"github.com/containerd/containerd/v2/sandbox"
)
func (c *Controller) Status(ctx context.Context, sandboxID string, verbose bool) (sandbox.ControllerStatus, error) {

2
pkg/cri/server/podsandbox/sandbox_stop.go
View File

@ -26,12 +26,12 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/sandbox"
)
func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error {

2
pkg/cri/server/podsandbox/types/podsandbox.go
View File

@ -22,9 +22,9 @@ import (
"time"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/pkg/cri/store"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
"github.com/containerd/containerd/v2/sandbox"
)
type PodSandbox struct {

2
pkg/cri/server/sandbox_run.go
View File

@ -32,6 +32,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerd "github.com/containerd/containerd/v2/client"
sb "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
"github.com/containerd/containerd/v2/pkg/cri/bandwidth"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
@ -39,7 +40,6 @@ import (
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
"github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/containerd/v2/pkg/netns"
sb "github.com/containerd/containerd/v2/sandbox"
)
func init() {

2
pkg/cri/server/sandbox_service.go
View File

@ -22,8 +22,8 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/sandbox"
)
type criSandboxService struct {

2
pkg/cri/server/service.go
View File

@ -31,6 +31,7 @@ import (
"k8s.io/kubelet/pkg/cri/streaming"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/oci"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/nri"
@ -43,7 +44,6 @@ import (
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
osinterface "github.com/containerd/containerd/v2/pkg/os"
"github.com/containerd/containerd/v2/pkg/registrar"
"github.com/containerd/containerd/v2/sandbox"
)
// defaultNetworkPlugin is used for the default CNI configuration

2
pkg/cri/server/service_test.go
View File

@ -23,6 +23,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
"github.com/containerd/containerd/v2/pkg/cri/store/label"
@ -31,7 +32,6 @@ import (
ostesting "github.com/containerd/containerd/v2/pkg/os/testing"
"github.com/containerd/containerd/v2/pkg/registrar"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/sandbox"
)
type fakeSandboxService struct{}

2
plugins/sandbox/controller.go
View File

@ -24,6 +24,7 @@ import (
runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/events/exchange"
@ -31,7 +32,6 @@ import (
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime"
v2 "github.com/containerd/containerd/v2/runtime/v2"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"

2
runtime/v2/manager.go
View File

@ -28,6 +28,7 @@ import (
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events/exchange"
"github.com/containerd/containerd/v2/namespaces"
@ -38,7 +39,6 @@ import (
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/runtime"
shimbinary "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"

2
services/sandbox/controller_service.go
View File

@ -26,11 +26,11 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events"
api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"

2
services/sandbox/store_service.go
View File

@ -23,9 +23,9 @@ import (
api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"

2
services/server/server.go
View File

@ -53,6 +53,7 @@ import (
csproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/diff"
diffproxy "github.com/containerd/containerd/v2/core/diff/proxy"
sbproxy "github.com/containerd/containerd/v2/core/sandbox/proxy"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/deprecation"
"github.com/containerd/containerd/v2/pkg/dialer"
@ -60,7 +61,6 @@ import (
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/content/local"
sbproxy "github.com/containerd/containerd/v2/sandbox/proxy"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/services/warning"
ssproxy "github.com/containerd/containerd/v2/snapshots/proxy"