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

Move snapshots to core/snapshots

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-01-17 09:54:09 -08:00
parent e0fe656daf
commit fcd39ccc53
72 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,9 +30,9 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/seccomp"
"github.com/containerd/containerd/v2/pkg/seutil"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/log"
"github.com/moby/sys/mountinfo"

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

@@ -32,6 +32,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/core/snapshots"
"github.com/containerd/containerd/v2/errdefs"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
@@ -40,7 +41,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/snapshots"
)
func init() {

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

@@ -29,10 +29,10 @@ import (
"golang.org/x/sys/unix"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
"github.com/containerd/containerd/v2/pkg/userns"
"github.com/containerd/containerd/v2/snapshots"
)
func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig,

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

@@ -19,9 +19,9 @@
package podsandbox
import (
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
"github.com/containerd/containerd/v2/snapshots"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

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

@@ -25,9 +25,9 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
"github.com/containerd/containerd/v2/snapshots"
)
func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig,