Skip to content

Commit a8ef1fc

Browse files
authored
Merge pull request #5710 from fuweid/cri-cleanup
remove pkg/cri/platforms package
2 parents 51f2ce9 + ac75071 commit a8ef1fc

3 files changed

Lines changed: 1 addition & 58 deletions

File tree

pkg/cri/cri.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import (
4141

4242
criconfig "github.com/containerd/containerd/pkg/cri/config"
4343
"github.com/containerd/containerd/pkg/cri/constants"
44-
criplatforms "github.com/containerd/containerd/pkg/cri/platforms"
4544
"github.com/containerd/containerd/pkg/cri/server"
4645
)
4746

@@ -91,7 +90,7 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {
9190
client, err := containerd.New(
9291
"",
9392
containerd.WithDefaultNamespace(constants.K8sContainerdNamespace),
94-
containerd.WithDefaultPlatform(criplatforms.Default()),
93+
containerd.WithDefaultPlatform(platforms.Default()),
9594
containerd.WithServices(servicesOpts...),
9695
)
9796
if err != nil {

pkg/cri/platforms/default_unix.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

pkg/cri/platforms/default_windows.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)