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

Remove deprecated platforms package

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-01-19 22:56:11 -08:00
parent 3f620143fe
commit e79ec7a095
78 changed files with 75 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/server/base/cri_base.go
View File

@@ -34,9 +34,9 @@ import (
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services/warning"
"github.com/containerd/platforms"
)
// CRIBase contains common dependencies for CRI's runtime, image, and podsandbox services.

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

@@ -45,7 +45,7 @@ import (
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/platforms"
"github.com/containerd/platforms"
)
func init() {

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

@@ -31,7 +31,7 @@ import (
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/platforms"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/selinux/go-selinux"

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

@@ -25,7 +25,7 @@ import (
"testing"
ostesting "github.com/containerd/containerd/v2/pkg/os/testing"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/platforms"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"

2
pkg/cri/server/images/check.go
View File

@@ -22,8 +22,8 @@ import (
"sync"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log"
"github.com/containerd/platforms"
)
// LoadImages checks all existing images to ensure they are ready to

2
pkg/cri/server/images/image_pull_test.go
View File

@@ -29,7 +29,7 @@ import (
"github.com/containerd/containerd/v2/pkg/cri/annotations"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/labels"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/platforms"
)
func TestParseAuth(t *testing.T) {

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

@@ -29,8 +29,8 @@ import (
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot"
"github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log"
"github.com/containerd/platforms"
docker "github.com/distribution/reference"
imagedigest "github.com/opencontainers/go-digest"

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

@@ -24,7 +24,7 @@ import (
imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/platforms"
"github.com/stretchr/testify/assert"
)

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

@@ -38,9 +38,9 @@ import (
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/platforms"
)
func init() {

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

@@ -31,7 +31,7 @@ import (
servertesting "github.com/containerd/containerd/v2/pkg/cri/testing"
"github.com/containerd/containerd/v2/pkg/errdefs"
ostesting "github.com/containerd/containerd/v2/pkg/os/testing"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/platforms"
)
type fakeSandboxService struct{}