From 114df368f0724deb6ac1311ca38071a2fdee547c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:19 -0800 Subject: [PATCH] Move pkg/registrar to internal/registrar Signed-off-by: Derek McGowan --- {pkg => internal}/registrar/registrar.go | 0 {pkg => internal}/registrar/registrar_test.go | 0 pkg/cri/server/service.go | 2 +- pkg/cri/server/service_test.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => internal}/registrar/registrar.go (100%) rename {pkg => internal}/registrar/registrar_test.go (100%) diff --git a/pkg/registrar/registrar.go b/internal/registrar/registrar.go similarity index 100% rename from pkg/registrar/registrar.go rename to internal/registrar/registrar.go diff --git a/pkg/registrar/registrar_test.go b/internal/registrar/registrar_test.go similarity index 100% rename from pkg/registrar/registrar_test.go rename to internal/registrar/registrar_test.go diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index d9ef0f464..4fb8e28b7 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -32,6 +32,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/internal/registrar" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/nri" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" @@ -43,7 +44,6 @@ import ( ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" - "github.com/containerd/containerd/v2/pkg/registrar" ) // defaultNetworkPlugin is used for the default CNI configuration diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index b5c2d9ab6..f22f29a1b 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -24,13 +24,13 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/internal/registrar" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/store/label" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" "github.com/containerd/containerd/v2/pkg/errdefs" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" - "github.com/containerd/containerd/v2/pkg/registrar" "github.com/containerd/containerd/v2/platforms" )