Move CRI from pkg/ to internal/

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2024-02-02 09:45:44 -08:00
parent db1e16da34
commit bbac058cf3
215 changed files with 254 additions and 254 deletions

View File

@@ -27,7 +27,7 @@ import (
ctrdsrv "github.com/containerd/containerd/v2/cmd/containerd/server"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"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/log/logtest"
"github.com/containerd/platforms"

View File

@@ -30,7 +30,7 @@ import (
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
containerd "github.com/containerd/containerd/v2/client"
"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"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

View File

@@ -27,7 +27,7 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"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/errdefs"
"github.com/stretchr/testify/assert"

View File

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

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/remote"
dialer "github.com/containerd/containerd/v2/integration/remote/util"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/pkg/cri/types"
"github.com/containerd/containerd/v2/pkg/cri/util"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/internal/cri/constants"
"github.com/containerd/containerd/v2/internal/cri/types"
"github.com/containerd/containerd/v2/internal/cri/util"
)
const (

View File

@@ -35,8 +35,8 @@ import (
"github.com/stretchr/testify/require"
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/pkg/cri/types"
)
const (