From 58ff9d368d2882df209d5eead4d0007e78947bc4 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Tue, 23 Jan 2024 22:05:52 -0800 Subject: [PATCH] Move cri plugin to plugins subpackage Signed-off-by: Derek McGowan --- cmd/containerd/builtins/cri.go | 2 +- contrib/fuzz/builtins.go | 2 +- {pkg => plugins}/cri/cri.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => plugins}/cri/cri.go (100%) diff --git a/cmd/containerd/builtins/cri.go b/cmd/containerd/builtins/cri.go index 5c88cb9e4..4e68b40dd 100644 --- a/cmd/containerd/builtins/cri.go +++ b/cmd/containerd/builtins/cri.go @@ -19,7 +19,7 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/pkg/cri" + _ "github.com/containerd/containerd/v2/plugins/cri" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/runtime" ) diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 6c4888748..a5e5c2c1b 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -19,9 +19,9 @@ package fuzz import ( // base containerd imports _ "github.com/containerd/containerd/v2/core/runtime/v2" - _ "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" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/runtime" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" diff --git a/pkg/cri/cri.go b/plugins/cri/cri.go similarity index 100% rename from pkg/cri/cri.go rename to plugins/cri/cri.go