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

Move runc options to api directory

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-04-29 13:58:59 -07:00
parent 25a288662d
commit 4a45507772
28 changed files with 292 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cri/config/config.go
View File

@@ -29,7 +29,7 @@ import (
"k8s.io/kubelet/pkg/cri/streaming"
runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/v2/internal/cri/annotations"
"github.com/containerd/containerd/v2/pkg/deprecation"
runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"

2
internal/cri/server/container_checkpoint_linux.go
View File

@@ -32,9 +32,9 @@ import (
crmetadata "github.com/checkpoint-restore/checkpointctl/lib"
"github.com/checkpoint-restore/go-criu/v7"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf/proto"

2
internal/cri/server/helpers_test.go
View File

@@ -26,8 +26,8 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/v2/core/containers"
runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"
crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"

2
internal/cri/server/runtime_config_linux.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"sort"
runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/internal/cri/systemd"
"github.com/containerd/log"