From 11114b0a9a88b6829fe22e23f7511357b808a73a Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:03 -0800 Subject: [PATCH] Move gc/scheduler to plugins/gc Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- {gc/scheduler => plugins/gc}/metrics.go | 0 {gc/scheduler => plugins/gc}/scheduler.go | 0 {gc/scheduler => plugins/gc}/scheduler_test.go | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename {gc/scheduler => plugins/gc}/metrics.go (100%) rename {gc/scheduler => plugins/gc}/scheduler.go (100%) rename {gc/scheduler => plugins/gc}/scheduler_test.go (100%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 1badd7c18..af6923821 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,10 +18,10 @@ package builtins // register containerd builtins here import ( - _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 0f3dec7ba..707882049 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,12 +18,12 @@ package fuzz import ( // base containerd imports - _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 165295ea6..3fc4ed6fa 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -34,10 +34,10 @@ import ( "github.com/containerd/plugin" "github.com/opencontainers/go-digest" - _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/services/containers" diff --git a/gc/scheduler/metrics.go b/plugins/gc/metrics.go similarity index 100% rename from gc/scheduler/metrics.go rename to plugins/gc/metrics.go diff --git a/gc/scheduler/scheduler.go b/plugins/gc/scheduler.go similarity index 100% rename from gc/scheduler/scheduler.go rename to plugins/gc/scheduler.go diff --git a/gc/scheduler/scheduler_test.go b/plugins/gc/scheduler_test.go similarity index 100% rename from gc/scheduler/scheduler_test.go rename to plugins/gc/scheduler_test.go