github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8066 from fuweid/cleanup-blockio-init

Browse Source 
*: introduce wrapper pkgs for blockio and rdt
This commit is contained in:
Fu Wei
2023-02-13 14:05:32 +08:00
committed by GitHub
parent c6cf6b2522 60d04b0b0f
commit 2654ece1d0
16 changed files with 183 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/server/nri-api.go
View File

@@ -27,6 +27,7 @@ import (
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/blockio"
"github.com/containerd/containerd/pkg/cri/annotations"
cstore "github.com/containerd/containerd/pkg/cri/store/container"
sstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
@@ -247,7 +248,7 @@ func (a *nriAPI) WithContainerAdjustment() containerd.NewContainerOpts {
if className == "" {
return nil, nil
}
blockIO, err := blockIOToLinuxOci(className)
blockIO, err := blockio.ClassNameToLinuxOCI(className)
if err != nil {
return nil, err
}