move CDI calls to the linux-only code

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>

pkg/cri/server/container_create.go

@@ -239,10 +239,6 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
 		return nil, fmt.Errorf("failed to get runtime options: %w", err)
 	}
 
-	if c.config.EnableCDI {
-		opts = append(opts, containerd.WithCDI(spec, config.Annotations, c.config.CDISpecDirs))
-	}
-
 	opts = append(opts,
 		containerd.WithSpec(spec, specOpts...),
 		containerd.WithRuntime(sandboxInfo.Runtime.Name, runtimeOptions),

pkg/cri/server/container_create_linux.go

@@ -386,6 +386,9 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
 	if seccompSpecOpts != nil {
 		specOpts = append(specOpts, seccompSpecOpts)
 	}
+	if c.config.EnableCDI {
+		specOpts = append(specOpts, oci.WithCDI(config.Annotations, c.config.CDISpecDirs))
+	}
 	return specOpts, nil
 }
 

pkg/cri/server/container_create_linux_test.go

@@ -28,7 +28,6 @@ import (
 	"testing"
 
 	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/contrib/apparmor"
 	"github.com/containerd/containerd/contrib/seccomp"
@@ -1619,8 +1618,8 @@ containerEdits:
 		}
 		require.NoError(t, err)
 
-		injectFun := containerd.WithCDI(spec, test.annotations, []string{cdiDir})
-		err = injectFun(nil, nil, nil)
+		injectFun := oci.WithCDI(test.annotations, []string{cdiDir})
+		err = injectFun(nil, nil, nil, spec)
 		assert.Equal(t, test.expectError, err != nil)
 
 		if err != nil {