github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-27 19:35:32 +00:00
Code Issues Projects Releases Wiki Activity

gpu: Add CDI parsing for Sandbox as well

Browse Source 
Extend the CDI parsing for pod_sandbox as well, only single_container
was covered properly.

Signed-off-by: Zvonko Kaiser <zkaiser@nvidia.com>
This commit is contained in:
Zvonko Kaiser 2025-04-14 19:10:46 +00:00
parent 97f4bcb456
commit 6713db8990
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/runtime/pkg/containerd-shim-v2/create.go
View File

@ -112,19 +112,16 @@ func create(ctx context.Context, s *service, r *taskAPI.CreateTaskRequest) (*con
if s.sandbox != nil { if s.sandbox != nil {
return nil, fmt.Errorf("cannot create another sandbox in sandbox: %s", s.sandbox.ID()) return nil, fmt.Errorf("cannot create another sandbox in sandbox: %s", s.sandbox.ID())
} }
// Here we deal with CDI devices that are cold-plugged (k8s) and
// for the single_container (nerdctl, podman, ...) use-case.
// We can provide additional directories where to search for // We can provide additional directories where to search for
// CDI specs if needed. immutable OS's only have specific // CDI specs if needed. immutable OS's only have specific
// directories where applications can write too. For instance /opt/cdi // directories where applications can write too. For instance /opt/cdi
// //
// _, err = withCDI(ociSpec.Annotations, []string{"/opt/cdi"}, ociSpec) // _, err = withCDI(ociSpec.Annotations, []string{"/opt/cdi"}, ociSpec)
// _, err = config.WithCDI(ociSpec.Annotations, []string{}, ociSpec)
// Only inject CDI devices if single_container we do not want if err != nil {
// CDI devices in the pod_sandbox return nil, fmt.Errorf("adding CDI devices failed: %w", err)
if containerType == vc.SingleContainer {
_, err = config.WithCDI(ociSpec.Annotations, []string{}, ociSpec)
if err != nil {
return nil, fmt.Errorf("adding CDI devices failed: %w", err)
}
} }
s.config = runtimeConfig s.config = runtimeConfig