diff --git a/pkg/cri/sbserver/container_create.go b/pkg/cri/sbserver/container_create.go index cb7640579..42616344b 100644 --- a/pkg/cri/sbserver/container_create.go +++ b/pkg/cri/sbserver/container_create.go @@ -501,15 +501,10 @@ func (c *criService) buildContainerSpec( platformSpecOpts, err := c.platformSpec( id, sandboxID, - sandboxPid, - netNSPath, - containerName, - imageName, config, sandboxConfig, imageConfig, extraMounts, - ociRuntime, ) if err != nil { return nil, err diff --git a/pkg/cri/sbserver/container_create_linux.go b/pkg/cri/sbserver/container_create_linux.go index d8fcda6a8..171ce325f 100644 --- a/pkg/cri/sbserver/container_create_linux.go +++ b/pkg/cri/sbserver/container_create_linux.go @@ -36,7 +36,6 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/config" customopts "github.com/containerd/containerd/pkg/cri/opts" ) @@ -115,15 +114,10 @@ func (c *criService) containerMounts(sandboxID string, config *runtime.Container func (c *criService) platformSpec( id string, sandboxID string, - sandboxPid uint32, - netNSPath string, - containerName string, - imageName string, config *runtime.ContainerConfig, sandboxConfig *runtime.PodSandboxConfig, imageConfig *imagespec.ImageConfig, extraMounts []*runtime.Mount, - ociRuntime config.Runtime, ) (_ []oci.SpecOpts, retErr error) { specOpts := []oci.SpecOpts{} diff --git a/pkg/cri/sbserver/container_create_other.go b/pkg/cri/sbserver/container_create_other.go index 8c3c050a4..a2d8e1f27 100644 --- a/pkg/cri/sbserver/container_create_other.go +++ b/pkg/cri/sbserver/container_create_other.go @@ -23,8 +23,6 @@ import ( "github.com/containerd/containerd/snapshots" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - - "github.com/containerd/containerd/pkg/cri/config" ) // containerMounts sets up necessary container system file mounts @@ -36,15 +34,10 @@ func (c *criService) containerMounts(sandboxID string, config *runtime.Container func (c *criService) platformSpec( id string, sandboxID string, - sandboxPid uint32, - netNSPath string, - containerName string, - imageName string, config *runtime.ContainerConfig, sandboxConfig *runtime.PodSandboxConfig, imageConfig *imagespec.ImageConfig, extraMounts []*runtime.Mount, - ociRuntime config.Runtime, ) ([]oci.SpecOpts, error) { return []oci.SpecOpts{}, nil } diff --git a/pkg/cri/sbserver/container_create_windows.go b/pkg/cri/sbserver/container_create_windows.go index c4ebf420b..c9d9b893d 100644 --- a/pkg/cri/sbserver/container_create_windows.go +++ b/pkg/cri/sbserver/container_create_windows.go @@ -23,7 +23,6 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/cri/config" customopts "github.com/containerd/containerd/pkg/cri/opts" "github.com/containerd/containerd/snapshots" ) @@ -36,15 +35,10 @@ func (c *criService) containerMounts(sandboxID string, config *runtime.Container func (c *criService) platformSpec( id string, sandboxID string, - sandboxPid uint32, - netNSPath string, - containerName string, - imageName string, config *runtime.ContainerConfig, sandboxConfig *runtime.PodSandboxConfig, imageConfig *imagespec.ImageConfig, extraMounts []*runtime.Mount, - ociRuntime config.Runtime, ) ([]oci.SpecOpts, error) { specOpts := []oci.SpecOpts{}