Merge pull request containerd#9961 from zhanluxianshen/clean-cri-opts

Clean cri options and useless parms
aepifanov · Mar 19, 2024 · 9a4231d · 9a4231d
2 parents 2986e45 + df26c18
commit 9a4231d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/internal/cri/opts/spec_linux_opts.go b/internal/cri/opts/spec_linux_opts.go
@@ -357,7 +357,7 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
 			s.Linux.Resources.CPU.Cpus = cpus
 		}
 		if mems := resources.GetCpusetMems(); mems != "" {
-			s.Linux.Resources.CPU.Mems = resources.GetCpusetMems()
+			s.Linux.Resources.CPU.Mems = mems
 		}
 		if limit != 0 {
 			s.Linux.Resources.Memory.Limit = &limit

diff --git a/internal/cri/server/container_create.go b/internal/cri/server/container_create.go
@@ -556,7 +556,6 @@ func (c *criService) buildContainerSpec(
 			id,
 			sandboxID,
 			sandboxPid,
-			netNSPath,
 			containerName,
 			imageName,
 			config,
@@ -568,9 +567,7 @@ func (c *criService) buildContainerSpec(
 		)
 	case isWindows:
 		specOpts, err = c.buildWindowsSpec(
-			id,
 			sandboxID,
-			sandboxPid,
 			netNSPath,
 			containerName,
 			imageName,
@@ -579,11 +576,9 @@ func (c *criService) buildContainerSpec(
 			imageConfig,
 			extraMounts,
 			ociRuntime,
-			runtimeHandler,
 		)
 	case isDarwin:
 		specOpts, err = c.buildDarwinSpec(
-			id,
 			sandboxID,
 			containerName,
 			imageName,
@@ -592,7 +587,6 @@ func (c *criService) buildContainerSpec(
 			imageConfig,
 			extraMounts,
 			ociRuntime,
-			runtimeHandler,
 		)
 	default:
 		return nil, fmt.Errorf("unsupported spec platform: %s", platform.OS)
@@ -609,7 +603,6 @@ func (c *criService) buildLinuxSpec(
 	id string,
 	sandboxID string,
 	sandboxPid uint32,
-	netNSPath string,
 	containerName string,
 	imageName string,
 	config *runtime.ContainerConfig,
@@ -839,9 +832,7 @@ func (c *criService) buildLinuxSpec(
 }
 
 func (c *criService) buildWindowsSpec(
-	id string,
 	sandboxID string,
-	sandboxPid uint32,
 	netNSPath string,
 	containerName string,
 	imageName string,
@@ -850,7 +841,6 @@ func (c *criService) buildWindowsSpec(
 	imageConfig *imagespec.ImageConfig,
 	extraMounts []*runtime.Mount,
 	ociRuntime criconfig.Runtime,
-	runtimeHandler *runtime.RuntimeHandler,
 ) (_ []oci.SpecOpts, retErr error) {
 	var specOpts []oci.SpecOpts
 	specOpts = append(specOpts, customopts.WithProcessCommandLineOrArgsForWindows(config, imageConfig))
@@ -936,7 +926,6 @@ func (c *criService) buildWindowsSpec(
 }
 
 func (c *criService) buildDarwinSpec(
-	id string,
 	sandboxID string,
 	containerName string,
 	imageName string,
@@ -945,7 +934,6 @@ func (c *criService) buildDarwinSpec(
 	imageConfig *imagespec.ImageConfig,
 	extraMounts []*runtime.Mount,
 	ociRuntime criconfig.Runtime,
-	runtimeHandler *runtime.RuntimeHandler,
 ) (_ []oci.SpecOpts, retErr error) {
 	specOpts := []oci.SpecOpts{
 		customopts.WithProcessArgs(config, imageConfig),