add configuration for CDI

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

pkg/cri/server/container_create.go

@@ -238,8 +238,12 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
 	if err != nil {
 		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.WithCDI(spec, config.Annotations),
 		containerd.WithSpec(spec, specOpts...),
 		containerd.WithRuntime(sandboxInfo.Runtime.Name, runtimeOptions),
 		containerd.WithContainerLabels(containerLabels),

pkg/cri/server/container_create_linux_test.go

@@ -1507,7 +1507,7 @@ func writeFilesToTempDir(tmpDirPattern string, content []string) (string, error)
 		}
 	}
 
-	return dir, cdi.GetRegistry(cdi.WithSpecDirs(dir)).Refresh()
+	return dir, nil
 }
 
 func TestCDIInjections(t *testing.T) {
@@ -1619,7 +1619,7 @@ containerEdits:
 		}
 		require.NoError(t, err)
 
-		injectFun := containerd.WithCDI(spec, test.annotations)
+		injectFun := containerd.WithCDI(spec, test.annotations, []string{cdiDir})
 		err = injectFun(nil, nil, nil)
 		assert.Equal(t, test.expectError, err != nil)