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

Merge pull request #9741 from mxpv/internal_cri

Browse Source 
Move CRI from pkg/ to internal/
This commit is contained in:
Samuel Karp 2024-02-02 19:38:44 +00:00 committed by GitHub
commit 1a39b91819
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
215 changed files with 254 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerd-stress/cri_worker.go
View File

@ -24,7 +24,7 @@ import (
"time" "time"
internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/log" "github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
) )

8
contrib/fuzz/cri_fuzzer.go
View File

@ -24,10 +24,10 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/internal/cri/server"
"github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/internal/cri/server/images"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
) )
var ( var (

8
contrib/fuzz/cri_server_fuzzer.go
View File

@ -24,10 +24,10 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/instrument" "github.com/containerd/containerd/v2/internal/cri/instrument"
"github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/internal/cri/server"
"github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/internal/cri/server/images"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
integration/build_local_containerd_helper_test.go
View File

@ -27,7 +27,7 @@ import (
ctrdsrv "github.com/containerd/containerd/v2/cmd/containerd/server" ctrdsrv "github.com/containerd/containerd/v2/cmd/containerd/server"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/internal/cri/constants"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"
"github.com/containerd/platforms" "github.com/containerd/platforms"

2
integration/container_update_resources_test.go
View File

@ -30,7 +30,7 @@ import (
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/integration/images"
criopts "github.com/containerd/containerd/v2/pkg/cri/opts" criopts "github.com/containerd/containerd/v2/internal/cri/opts"
runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
integration/containerd_image_test.go
View File

@ -27,7 +27,7 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/internal/cri/labels"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

6
integration/image_pull_timeout_test.go
View File

@ -42,9 +42,9 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
criserver "github.com/containerd/containerd/v2/pkg/cri/server" criserver "github.com/containerd/containerd/v2/internal/cri/server"
"github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/internal/cri/server/images"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
) )

8
integration/main_test.go
View File

@ -49,10 +49,10 @@ import (
_ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var _ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var
"github.com/containerd/containerd/v2/integration/remote" "github.com/containerd/containerd/v2/integration/remote"
dialer "github.com/containerd/containerd/v2/integration/remote/util" dialer "github.com/containerd/containerd/v2/integration/remote/util"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/internal/cri/constants"
"github.com/containerd/containerd/v2/pkg/cri/types" "github.com/containerd/containerd/v2/internal/cri/types"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
) )
const ( const (

2
integration/sandbox_run_rollback_test.go
View File

@ -35,8 +35,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1" criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/internal/cri/types"
"github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/internal/failpoint"
"github.com/containerd/containerd/v2/pkg/cri/types"
) )
const ( const (

2
pkg/cri/annotations/annotations.go → internal/cri/annotations/annotations.go
View File

@ -17,7 +17,7 @@
package annotations package annotations
import ( import (
customopts "github.com/containerd/containerd/v2/pkg/cri/opts" customopts "github.com/containerd/containerd/v2/internal/cri/opts"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
) )

0
pkg/cri/bandwidth/doc.go → internal/cri/bandwidth/doc.go
View File

0
pkg/cri/bandwidth/fake_shaper.go → internal/cri/bandwidth/fake_shaper.go
View File

0
pkg/cri/bandwidth/interfaces.go → internal/cri/bandwidth/interfaces.go
View File

0
pkg/cri/bandwidth/linux.go → internal/cri/bandwidth/linux.go
View File

0
pkg/cri/bandwidth/unsupported.go → internal/cri/bandwidth/unsupported.go
View File

0
pkg/cri/bandwidth/utils.go → internal/cri/bandwidth/utils.go
View File

2
pkg/cri/config/config.go → internal/cri/config/config.go
View File

@ -36,7 +36,7 @@ import (
runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/internal/cri/annotations"
"github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/deprecation"
runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

0
pkg/cri/config/config_kernel_linux.go → internal/cri/config/config_kernel_linux.go
View File

0
pkg/cri/config/config_kernel_linux_test.go → internal/cri/config/config_kernel_linux_test.go
View File

0
pkg/cri/config/config_kernel_other.go → internal/cri/config/config_kernel_other.go
View File

0
pkg/cri/config/config_test.go → internal/cri/config/config_test.go
View File

0
pkg/cri/config/config_unix.go → internal/cri/config/config_unix.go
View File

0
pkg/cri/config/config_windows.go → internal/cri/config/config_windows.go
View File

0
pkg/cri/config/streaming.go → internal/cri/config/streaming.go
View File

0
pkg/cri/config/streaming_test.go → internal/cri/config/streaming_test.go
View File

0
pkg/cri/constants/constants.go → internal/cri/constants/constants.go
View File

2
pkg/cri/instrument/instrumented_service.go → internal/cri/instrument/instrumented_service.go
View File

@ -24,7 +24,7 @@ import (
"github.com/containerd/log" "github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
) )
const ( const (

2
pkg/cri/io/container_io.go → internal/cri/io/container_io.go
View File

@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
cioutil "github.com/containerd/containerd/v2/pkg/ioutil" cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
) )

0
pkg/cri/io/exec_io.go → internal/cri/io/exec_io.go
View File

0
pkg/cri/io/helpers.go → internal/cri/io/helpers.go
View File

0
pkg/cri/io/helpers_unix.go → internal/cri/io/helpers_unix.go
View File

0
pkg/cri/io/helpers_windows.go → internal/cri/io/helpers_windows.go
View File

0
pkg/cri/io/logger.go → internal/cri/io/logger.go
View File

0
pkg/cri/io/logger_test.go → internal/cri/io/logger_test.go
View File

0
pkg/cri/io/metrics.go → internal/cri/io/metrics.go
View File

0
pkg/cri/labels/labels.go → internal/cri/labels/labels.go
View File

6
pkg/cri/nri/nri_api.go → internal/cri/nri/nri_api.go
View File

@ -20,9 +20,9 @@ import (
"context" "context"
"time" "time"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" cstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
cri "k8s.io/cri-api/pkg/apis/runtime/v1" cri "k8s.io/cri-api/pkg/apis/runtime/v1"
) )

10
pkg/cri/nri/nri_api_linux.go → internal/cri/nri/nri_api_linux.go
View File

@ -23,12 +23,12 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/internal/cri/annotations"
"github.com/containerd/containerd/v2/internal/cri/constants"
cstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
"github.com/containerd/containerd/v2/pkg/cri/constants"
cstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

6
pkg/cri/nri/nri_api_other.go → internal/cri/nri/nri_api_other.go
View File

@ -23,12 +23,12 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" cstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
cri "k8s.io/cri-api/pkg/apis/runtime/v1" cri "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/internal/cri/constants"
"github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/containerd/v2/pkg/nri"
"github.com/containerd/nri/pkg/api" "github.com/containerd/nri/pkg/api"

0
pkg/cri/opts/container.go → internal/cri/opts/container.go
View File

0
pkg/cri/opts/spec_darwin_opts.go → internal/cri/opts/spec_darwin_opts.go
View File

0
pkg/cri/opts/spec_linux.go → internal/cri/opts/spec_linux.go
View File

2
pkg/cri/opts/spec_linux_opts.go → internal/cri/opts/spec_linux_opts.go
View File

@ -38,7 +38,7 @@ import (
"github.com/containerd/log" "github.com/containerd/log"
) )
// RuntimeConfig is a subset of [github.com/containerd/containerd/v2/pkg/cri/config]. // RuntimeConfig is a subset of [github.com/containerd/containerd/v2/internal/cri/config].
// Needed for avoiding circular imports. // Needed for avoiding circular imports.
type RuntimeConfig struct { type RuntimeConfig struct {
TreatRoMountsAsRro bool // only applies to volumes TreatRoMountsAsRro bool // only applies to volumes

0
pkg/cri/opts/spec_linux_test.go → internal/cri/opts/spec_linux_test.go
View File

0
pkg/cri/opts/spec_nonlinux.go → internal/cri/opts/spec_nonlinux.go
View File

0
pkg/cri/opts/spec_nonwindows.go → internal/cri/opts/spec_nonwindows.go
View File

2
pkg/cri/opts/spec_opts.go → internal/cri/opts/spec_opts.go
View File

@ -30,7 +30,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
) )

0
pkg/cri/opts/spec_opts_test.go → internal/cri/opts/spec_opts_test.go
View File

0
pkg/cri/opts/spec_windows.go → internal/cri/opts/spec_windows.go
View File

0
pkg/cri/opts/spec_windows_opts.go → internal/cri/opts/spec_windows_opts.go
View File

0
pkg/cri/opts/spec_windows_test.go → internal/cri/opts/spec_windows_test.go
View File

0
pkg/cri/server/blockio_linux.go → internal/cri/server/blockio_linux.go
View File

0
pkg/cri/server/blockio_stub.go → internal/cri/server/blockio_stub.go
View File

0
pkg/cri/server/cni_conf_syncer.go → internal/cri/server/cni_conf_syncer.go
View File

2
pkg/cri/server/container_attach.go → internal/cri/server/container_attach.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
cio "github.com/containerd/containerd/v2/pkg/cri/io" cio "github.com/containerd/containerd/v2/internal/cri/io"
) )
// Attach prepares a streaming endpoint to attach to a running container, and returns the address. // Attach prepares a streaming endpoint to attach to a running container, and returns the address.

0
pkg/cri/server/container_checkpoint.go → internal/cri/server/container_checkpoint.go
View File

14
pkg/cri/server/container_create.go → internal/cri/server/container_create.go
View File

@ -36,14 +36,14 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/internal/cri/annotations"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"
cio "github.com/containerd/containerd/v2/internal/cri/io"
crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
customopts "github.com/containerd/containerd/v2/internal/cri/opts"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
cio "github.com/containerd/containerd/v2/pkg/cri/io"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
"github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/platforms" "github.com/containerd/platforms"
) )

2
pkg/cri/server/container_create_linux.go → internal/cri/server/container_create_linux.go
View File

@ -33,7 +33,7 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
customopts "github.com/containerd/containerd/v2/pkg/cri/opts" customopts "github.com/containerd/containerd/v2/internal/cri/opts"
) )
const ( const (

12
pkg/cri/server/container_create_linux_test.go → internal/cri/server/container_create_linux_test.go
View File

@ -39,13 +39,13 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/containerd/containerd/v2/internal/cri/annotations"
"github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/internal/cri/opts"
customopts "github.com/containerd/containerd/v2/internal/cri/opts"
"github.com/containerd/containerd/v2/internal/cri/util"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/pkg/cap" "github.com/containerd/containerd/v2/pkg/cap"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
"github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/opts"
customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
"github.com/containerd/containerd/v2/pkg/cri/util"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
ostesting "github.com/containerd/containerd/v2/pkg/os/testing" ostesting "github.com/containerd/containerd/v2/pkg/os/testing"
) )

0
pkg/cri/server/container_create_other.go → internal/cri/server/container_create_other.go
View File

2
pkg/cri/server/container_create_other_test.go → internal/cri/server/container_create_other_test.go
View File

@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/internal/cri/annotations"
) )
// checkMount is defined by all tests but not used here // checkMount is defined by all tests but not used here

6
pkg/cri/server/container_create_test.go → internal/cri/server/container_create_test.go
View File

@ -33,9 +33,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/internal/cri/constants"
"github.com/containerd/containerd/v2/pkg/cri/opts" "github.com/containerd/containerd/v2/internal/cri/opts"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
) )

0
pkg/cri/server/container_create_windows.go → internal/cri/server/container_create_windows.go
View File

4
pkg/cri/server/container_create_windows_test.go → internal/cri/server/container_create_windows_test.go
View File

@ -26,8 +26,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/internal/cri/annotations"
"github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/internal/cri/config"
) )
func getSandboxConfig() *runtime.PodSandboxConfig { func getSandboxConfig() *runtime.PodSandboxConfig {

0
pkg/cri/server/container_events.go → internal/cri/server/container_events.go
View File

0
pkg/cri/server/container_exec.go → internal/cri/server/container_exec.go
View File

4
pkg/cri/server/container_execsync.go → internal/cri/server/container_execsync.go
View File

@ -32,8 +32,8 @@ import (
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
cio "github.com/containerd/containerd/v2/pkg/cri/io" cio "github.com/containerd/containerd/v2/internal/cri/io"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
cioutil "github.com/containerd/containerd/v2/pkg/ioutil" cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
) )

0
pkg/cri/server/container_execsync_test.go → internal/cri/server/container_execsync_test.go
View File

2
pkg/cri/server/container_list.go → internal/cri/server/container_list.go
View File

@ -22,7 +22,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
) )
// ListContainers lists all containers matching the filter. // ListContainers lists all containers matching the filter.

4
pkg/cri/server/container_list_test.go → internal/cri/server/container_list_test.go
View File

@ -25,8 +25,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
) )
func TestToCRIContainer(t *testing.T) { func TestToCRIContainer(t *testing.T) {

0
pkg/cri/server/container_log_reopen.go → internal/cri/server/container_log_reopen.go
View File

2
pkg/cri/server/container_remove.go → internal/cri/server/container_remove.go
View File

@ -23,7 +23,7 @@ import (
"time" "time"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

2
pkg/cri/server/container_remove_test.go → internal/cri/server/container_remove_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
) )
// TestSetContainerRemoving tests setContainerRemoving sets removing // TestSetContainerRemoving tests setContainerRemoving sets removing

8
pkg/cri/server/container_start.go → internal/cri/server/container_start.go
View File

@ -29,10 +29,10 @@ import (
"github.com/containerd/log" "github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
cio "github.com/containerd/containerd/v2/pkg/cri/io" cio "github.com/containerd/containerd/v2/internal/cri/io"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
cioutil "github.com/containerd/containerd/v2/pkg/ioutil" cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
) )

2
pkg/cri/server/container_start_test.go → internal/cri/server/container_start_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
) )
// TestSetContainerStarting tests setContainerStarting sets removing // TestSetContainerStarting tests setContainerStarting sets removing

0
pkg/cri/server/container_stats.go → internal/cri/server/container_stats.go
View File

4
pkg/cri/server/container_stats_list.go → internal/cri/server/container_stats_list.go
View File

@ -32,8 +32,8 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/pkg/cri/store/stats" "github.com/containerd/containerd/v2/internal/cri/store/stats"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

4
pkg/cri/server/container_stats_list_test.go → internal/cri/server/container_stats_list_test.go
View File

@ -26,8 +26,8 @@ import (
v1 "github.com/containerd/cgroups/v3/cgroup1/stats" v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
v2 "github.com/containerd/cgroups/v3/cgroup2/stats" v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
) )

4
pkg/cri/server/container_status.go → internal/cri/server/container_status.go
View File

@ -21,8 +21,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go"

8
pkg/cri/server/container_status_test.go → internal/cri/server/container_status_test.go
View File

@ -22,13 +22,13 @@ import (
"testing" "testing"
"time" "time"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" imagestore "github.com/containerd/containerd/v2/internal/cri/store/image"
) )
func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status, func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status,

4
pkg/cri/server/container_stop.go → internal/cri/server/container_stop.go
View File

@ -24,8 +24,8 @@ import (
"time" "time"
eventtypes "github.com/containerd/containerd/v2/api/events" eventtypes "github.com/containerd/containerd/v2/api/events"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"

2
pkg/cri/server/container_stop_test.go → internal/cri/server/container_stop_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
) )
func TestWaitContainerStop(t *testing.T) { func TestWaitContainerStop(t *testing.T) {

4
pkg/cri/server/container_update_resources.go → internal/cri/server/container_update_resources.go
View File

@ -32,8 +32,8 @@ import (
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
) )
// UpdateContainerResources updates ContainerConfig of the container. // UpdateContainerResources updates ContainerConfig of the container.

6
pkg/cri/server/container_update_resources_linux.go → internal/cri/server/container_update_resources_linux.go
View File

@ -23,9 +23,9 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/opts" "github.com/containerd/containerd/v2/internal/cri/opts"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
) )
// updateOCIResource updates container resource limit. // updateOCIResource updates container resource limit.

4
pkg/cri/server/container_update_resources_linux_test.go → internal/cri/server/container_update_resources_linux_test.go
View File

@ -25,8 +25,8 @@ import (
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
criopts "github.com/containerd/containerd/v2/pkg/cri/opts" criopts "github.com/containerd/containerd/v2/internal/cri/opts"
) )
func TestUpdateOCILinuxResource(t *testing.T) { func TestUpdateOCILinuxResource(t *testing.T) {

2
pkg/cri/server/container_update_resources_other.go → internal/cri/server/container_update_resources_other.go
View File

@ -24,7 +24,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
) )
// UpdateContainerResources updates ContainerConfig of the container. // UpdateContainerResources updates ContainerConfig of the container.

6
pkg/cri/server/container_update_resources_windows.go → internal/cri/server/container_update_resources_windows.go
View File

@ -23,9 +23,9 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/opts" "github.com/containerd/containerd/v2/internal/cri/opts"
"github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/internal/cri/util"
) )
// updateOCIResource updates container resource limit. // updateOCIResource updates container resource limit.

8
pkg/cri/server/events.go → internal/cri/server/events.go
View File

@ -31,11 +31,11 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events" eventtypes "github.com/containerd/containerd/v2/api/events"
apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/internal/cri/constants"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
containerdio "github.com/containerd/containerd/v2/pkg/cio" containerdio "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/cri/constants"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
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/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"

0
pkg/cri/server/events_test.go → internal/cri/server/events_test.go
View File

2
pkg/cri/server/fuzz.go → internal/cri/server/fuzz.go
View File

@ -21,7 +21,7 @@ package server
import ( import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
) )
func SandboxStore(cs CRIService) (*sandbox.Store, error) { func SandboxStore(cs CRIService) (*sandbox.Store, error) {

6
pkg/cri/server/helpers.go → internal/cri/server/helpers.go
View File

@ -33,9 +33,9 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" imagestore "github.com/containerd/containerd/v2/internal/cri/store/image"
clabels "github.com/containerd/containerd/v2/pkg/labels" clabels "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"

0
pkg/cri/server/helpers_linux.go → internal/cri/server/helpers_linux.go
View File

0
pkg/cri/server/helpers_other.go → internal/cri/server/helpers_other.go
View File

6
pkg/cri/server/helpers_test.go → internal/cri/server/helpers_test.go
View File

@ -28,9 +28,9 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

0
pkg/cri/server/helpers_windows.go → internal/cri/server/helpers_windows.go
View File

0
pkg/cri/server/helpers_windows_test.go → internal/cri/server/helpers_windows_test.go
View File

0
pkg/cri/server/images/check.go → internal/cri/server/images/check.go
View File

0
pkg/cri/server/images/image_list.go → internal/cri/server/images/image_list.go
View File

2
pkg/cri/server/images/image_list_test.go → internal/cri/server/images/image_list_test.go
View File

@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" imagestore "github.com/containerd/containerd/v2/internal/cri/store/image"
) )
func TestListImages(t *testing.T) { func TestListImages(t *testing.T) {

6
pkg/cri/server/images/image_pull.go → internal/cri/server/images/image_pull.go
View File

@ -44,9 +44,9 @@ import (
containerdimages "github.com/containerd/containerd/v2/core/images" containerdimages "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes/docker/config" "github.com/containerd/containerd/v2/core/remotes/docker/config"
"github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/internal/cri/annotations"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
snpkg "github.com/containerd/containerd/v2/pkg/snapshotters" snpkg "github.com/containerd/containerd/v2/pkg/snapshotters"
"github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/pkg/tracing"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"

Some files were not shown because too many files have changed in this diff Show More