cri: support blockio class in pod and container annotations
This patch adds support for a container annotation and two separate
pod annotations for controlling the blockio class of containers.
The container annotation can be used by a CRI client:
"io.kubernetes.cri.blockio-class"
Pod annotations specify the blockio class in the K8s pod spec level:
"blockio.resources.beta.kubernetes.io/pod"
(pod-wide default for all containers within)
"blockio.resources.beta.kubernetes.io/container.<container_name>"
(container-specific overrides)
Correspondingly, this patch adds support for --blockio-class and
--blockio-config-file to ctr, too.
This implementation follows the resource class annotation pattern
introduced in RDT and merged in commit 893701220.
Signed-off-by: Antti Kervinen <antti.kervinen@intel.com>
This commit is contained in:
@@ -39,6 +39,7 @@ import (
|
||||
"github.com/containerd/containerd/platforms"
|
||||
"github.com/containerd/containerd/runtime/v2/runc/options"
|
||||
"github.com/containerd/containerd/snapshots"
|
||||
"github.com/intel/goresctrl/pkg/blockio"
|
||||
"github.com/opencontainers/runtime-spec/specs-go"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/urfave/cli"
|
||||
@@ -329,6 +330,19 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
|
||||
})
|
||||
}
|
||||
|
||||
if c := context.String("blockio-config-file"); c != "" {
|
||||
if err := blockio.SetConfigFromFile(c, false); err != nil {
|
||||
return nil, fmt.Errorf("blockio-config-file error: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if c := context.String("blockio-class"); c != "" {
|
||||
if linuxBlockIO, err := blockio.OciLinuxBlockIO(c); err == nil {
|
||||
opts = append(opts, oci.WithBlockIO(linuxBlockIO))
|
||||
} else {
|
||||
return nil, fmt.Errorf("blockio-class error: %w", err)
|
||||
}
|
||||
}
|
||||
if c := context.String("rdt-class"); c != "" {
|
||||
opts = append(opts, oci.WithRdt(c, "", ""))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user