Move GenerateRuntimeOptions() to pkg/cri/config

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
This commit is contained in:
Kirtana Ashok
2023-12-07 12:23:00 -08:00
parent a68efb1bad
commit 25b052cbca
6 changed files with 49 additions and 49 deletions

View File

@@ -20,6 +20,7 @@ import (
"context"
"sort"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/systemd"
runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/log"
@@ -48,7 +49,7 @@ func (c *criService) getCgroupDriver(ctx context.Context) runtime.CgroupDriver {
})
for _, handler := range handlerNames {
opts, err := generateRuntimeOptions(c.config.ContainerdConfig.Runtimes[handler])
opts, err := criconfig.GenerateRuntimeOptions(c.config.ContainerdConfig.Runtimes[handler])
if err != nil {
log.G(ctx).Debugf("failed to parse runtime handler options for %q", handler)
continue