Remove unused params from platformSpec

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2023-01-10 15:08:37 -08:00
parent 1c1d8fb057
commit fdfa3519a3
4 changed files with 0 additions and 24 deletions

View File

@ -501,15 +501,10 @@ func (c *criService) buildContainerSpec(
platformSpecOpts, err := c.platformSpec( platformSpecOpts, err := c.platformSpec(
id, id,
sandboxID, sandboxID,
sandboxPid,
netNSPath,
containerName,
imageName,
config, config,
sandboxConfig, sandboxConfig,
imageConfig, imageConfig,
extraMounts, extraMounts,
ociRuntime,
) )
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -36,7 +36,6 @@ import (
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/pkg/cri/config"
customopts "github.com/containerd/containerd/pkg/cri/opts" 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( func (c *criService) platformSpec(
id string, id string,
sandboxID string, sandboxID string,
sandboxPid uint32,
netNSPath string,
containerName string,
imageName string,
config *runtime.ContainerConfig, config *runtime.ContainerConfig,
sandboxConfig *runtime.PodSandboxConfig, sandboxConfig *runtime.PodSandboxConfig,
imageConfig *imagespec.ImageConfig, imageConfig *imagespec.ImageConfig,
extraMounts []*runtime.Mount, extraMounts []*runtime.Mount,
ociRuntime config.Runtime,
) (_ []oci.SpecOpts, retErr error) { ) (_ []oci.SpecOpts, retErr error) {
specOpts := []oci.SpecOpts{} specOpts := []oci.SpecOpts{}

View File

@ -23,8 +23,6 @@ import (
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtime "k8s.io/cri-api/pkg/apis/runtime/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 // 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( func (c *criService) platformSpec(
id string, id string,
sandboxID string, sandboxID string,
sandboxPid uint32,
netNSPath string,
containerName string,
imageName string,
config *runtime.ContainerConfig, config *runtime.ContainerConfig,
sandboxConfig *runtime.PodSandboxConfig, sandboxConfig *runtime.PodSandboxConfig,
imageConfig *imagespec.ImageConfig, imageConfig *imagespec.ImageConfig,
extraMounts []*runtime.Mount, extraMounts []*runtime.Mount,
ociRuntime config.Runtime,
) ([]oci.SpecOpts, error) { ) ([]oci.SpecOpts, error) {
return []oci.SpecOpts{}, nil return []oci.SpecOpts{}, nil
} }

View File

@ -23,7 +23,6 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/cri/config"
customopts "github.com/containerd/containerd/pkg/cri/opts" customopts "github.com/containerd/containerd/pkg/cri/opts"
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
) )
@ -36,15 +35,10 @@ func (c *criService) containerMounts(sandboxID string, config *runtime.Container
func (c *criService) platformSpec( func (c *criService) platformSpec(
id string, id string,
sandboxID string, sandboxID string,
sandboxPid uint32,
netNSPath string,
containerName string,
imageName string,
config *runtime.ContainerConfig, config *runtime.ContainerConfig,
sandboxConfig *runtime.PodSandboxConfig, sandboxConfig *runtime.PodSandboxConfig,
imageConfig *imagespec.ImageConfig, imageConfig *imagespec.ImageConfig,
extraMounts []*runtime.Mount, extraMounts []*runtime.Mount,
ociRuntime config.Runtime,
) ([]oci.SpecOpts, error) { ) ([]oci.SpecOpts, error) {
specOpts := []oci.SpecOpts{} specOpts := []oci.SpecOpts{}