From 508aa3a1efd3dafc4be50d6ecec62e5de4b3deb6 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 11 Sep 2023 21:16:16 -0700 Subject: [PATCH] Move to use github.com/containerd/log Add github.com/containerd/log to go.mod Signed-off-by: Derek McGowan --- archive/compression/compression.go | 2 +- archive/tar.go | 2 +- archive/tar_linux_test.go | 2 +- cio/io_windows.go | 2 +- cmd/containerd-stress/cri_worker.go | 2 +- cmd/containerd-stress/density.go | 2 +- cmd/containerd-stress/exec_worker.go | 2 +- cmd/containerd-stress/main.go | 2 +- cmd/containerd-stress/size.go | 2 +- cmd/containerd-stress/worker.go | 2 +- cmd/containerd/command/main.go | 2 +- cmd/containerd/command/main_unix.go | 2 +- cmd/containerd/command/main_windows.go | 2 +- cmd/containerd/command/notify_systemd.go | 2 +- cmd/ctr/app/main.go | 2 +- cmd/ctr/commands/client.go | 2 +- cmd/ctr/commands/containers/containers.go | 2 +- cmd/ctr/commands/containers/restore.go | 2 +- cmd/ctr/commands/content/content.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/content/prune.go | 2 +- cmd/ctr/commands/events/events.go | 2 +- cmd/ctr/commands/images/images.go | 2 +- cmd/ctr/commands/images/import.go | 2 +- cmd/ctr/commands/images/pull.go | 2 +- cmd/ctr/commands/images/push.go | 2 +- cmd/ctr/commands/namespaces/namespaces.go | 2 +- cmd/ctr/commands/resolver.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- cmd/ctr/commands/run/run_windows.go | 2 +- cmd/ctr/commands/sandboxes/sandboxes.go | 2 +- cmd/ctr/commands/shim/shim.go | 2 +- cmd/ctr/commands/signals.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- cmd/ctr/commands/tasks/attach.go | 2 +- cmd/ctr/commands/tasks/delete.go | 2 +- cmd/ctr/commands/tasks/exec.go | 2 +- cmd/ctr/commands/tasks/kill.go | 2 +- cmd/ctr/commands/tasks/start.go | 2 +- cmd/ctr/commands/tasks/tasks_unix.go | 2 +- cmd/ctr/commands/tasks/tasks_windows.go | 2 +- content/helpers.go | 2 +- content/local/store.go | 2 +- content/local/writer.go | 2 +- content/testsuite/testsuite.go | 2 +- contrib/fuzz/archive_fuzzer.go | 2 +- diff/apply/apply.go | 2 +- diff/lcow/lcow.go | 2 +- diff/stream_windows.go | 2 +- diff/walking/differ.go | 2 +- diff/windows/windows.go | 2 +- events/exchange/exchange.go | 2 +- filters/filter.go | 2 +- gc/scheduler/scheduler.go | 2 +- images/archive/importer.go | 2 +- images/converter/default.go | 2 +- images/diffid.go | 2 +- images/image.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- integration/client/client.go | 2 +- integration/client/client_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/go.mod | 2 +- integration/image_pull_timeout_test.go | 4 ++-- integration/images/image_list.go | 2 +- integration/main_test.go | 2 +- metadata/containers_test.go | 2 +- metadata/content.go | 2 +- metadata/db.go | 2 +- metadata/db_test.go | 2 +- metadata/gc.go | 2 +- metadata/plugin/plugin.go | 2 +- metadata/snapshot.go | 2 +- metrics/cgroups/v1/cgroups.go | 2 +- metrics/cgroups/v1/metrics.go | 2 +- metrics/cgroups/v1/oom.go | 2 +- metrics/cgroups/v2/metrics.go | 2 +- mount/mount_windows.go | 2 +- mount/temp.go | 2 +- oci/spec_opts.go | 2 +- pkg/blockio/blockio_linux.go | 2 +- pkg/cri/config/config.go | 2 +- pkg/cri/cri.go | 2 +- pkg/cri/instrument/instrumented_service.go | 2 +- pkg/cri/io/container_io.go | 2 +- pkg/cri/io/exec_io.go | 2 +- pkg/cri/io/logger.go | 2 +- pkg/cri/nri/nri_api_linux.go | 2 +- pkg/cri/opts/container.go | 2 +- pkg/cri/opts/spec_linux.go | 2 +- pkg/cri/opts/spec_linux_opts.go | 2 +- pkg/cri/sbserver/blockio_linux.go | 2 +- pkg/cri/sbserver/cni_conf_syncer.go | 2 +- pkg/cri/sbserver/container_attach.go | 2 +- pkg/cri/sbserver/container_create.go | 2 +- pkg/cri/sbserver/container_execsync.go | 2 +- pkg/cri/sbserver/container_remove.go | 2 +- pkg/cri/sbserver/container_start.go | 2 +- pkg/cri/sbserver/container_stats_list.go | 2 +- pkg/cri/sbserver/container_stop.go | 2 +- pkg/cri/sbserver/container_update_resources.go | 2 +- pkg/cri/sbserver/events.go | 2 +- pkg/cri/sbserver/helpers.go | 2 +- pkg/cri/sbserver/helpers_linux.go | 2 +- pkg/cri/sbserver/images/image_pull.go | 2 +- pkg/cri/sbserver/images/image_status.go | 2 +- pkg/cri/sbserver/images/service.go | 2 +- pkg/cri/sbserver/images/snapshots.go | 2 +- pkg/cri/sbserver/podsandbox/controller.go | 2 +- pkg/cri/sbserver/podsandbox/helpers.go | 2 +- pkg/cri/sbserver/podsandbox/helpers_linux.go | 2 +- pkg/cri/sbserver/podsandbox/opts.go | 2 +- pkg/cri/sbserver/podsandbox/recover.go | 2 +- pkg/cri/sbserver/podsandbox/sandbox_delete.go | 2 +- pkg/cri/sbserver/podsandbox/sandbox_run.go | 2 +- pkg/cri/sbserver/podsandbox/sandbox_stop.go | 2 +- pkg/cri/sbserver/rdt.go | 2 +- pkg/cri/sbserver/restart.go | 2 +- pkg/cri/sbserver/runtime_config_linux.go | 2 +- pkg/cri/sbserver/sandbox_portforward_linux.go | 2 +- pkg/cri/sbserver/sandbox_remove.go | 2 +- pkg/cri/sbserver/sandbox_run.go | 2 +- pkg/cri/sbserver/sandbox_stats_linux.go | 2 +- pkg/cri/sbserver/sandbox_stats_list.go | 2 +- pkg/cri/sbserver/sandbox_stats_windows.go | 2 +- pkg/cri/sbserver/sandbox_stop.go | 2 +- pkg/cri/sbserver/service.go | 2 +- pkg/cri/sbserver/service_linux.go | 2 +- pkg/cri/sbserver/status.go | 2 +- pkg/cri/sbserver/update_runtime_config.go | 2 +- pkg/cri/server/blockio_linux.go | 2 +- pkg/cri/server/cni_conf_syncer.go | 2 +- pkg/cri/server/container_attach.go | 2 +- pkg/cri/server/container_create.go | 2 +- pkg/cri/server/container_execsync.go | 2 +- pkg/cri/server/container_remove.go | 2 +- pkg/cri/server/container_start.go | 2 +- pkg/cri/server/container_stop.go | 2 +- pkg/cri/server/container_update_resources.go | 2 +- pkg/cri/server/events.go | 2 +- pkg/cri/server/helpers.go | 2 +- pkg/cri/server/helpers_linux.go | 2 +- pkg/cri/server/image_pull.go | 2 +- pkg/cri/server/image_status.go | 2 +- pkg/cri/server/rdt_linux.go | 2 +- pkg/cri/server/restart.go | 2 +- pkg/cri/server/runtime_config_linux.go | 2 +- pkg/cri/server/sandbox_portforward_linux.go | 2 +- pkg/cri/server/sandbox_remove.go | 2 +- pkg/cri/server/sandbox_run.go | 2 +- pkg/cri/server/sandbox_stats_linux.go | 2 +- pkg/cri/server/sandbox_stats_list.go | 2 +- pkg/cri/server/sandbox_stats_windows.go | 2 +- pkg/cri/server/sandbox_stop.go | 2 +- pkg/cri/server/service.go | 2 +- pkg/cri/server/service_linux.go | 2 +- pkg/cri/server/snapshots.go | 2 +- pkg/cri/server/status.go | 2 +- pkg/cri/server/update_runtime_config.go | 2 +- pkg/imageverifier/bindir/bindir.go | 5 ++--- pkg/imageverifier/bindir/bindir_test.go | 5 ++--- pkg/imageverifier/bindir/processes_windows.go | 2 +- pkg/nri/domain.go | 2 +- pkg/nri/nri.go | 2 +- pkg/oom/v1/v1.go | 2 +- pkg/oom/v2/v2.go | 2 +- pkg/process/init.go | 2 +- pkg/process/init_state.go | 2 +- pkg/process/io.go | 2 +- pkg/rdt/rdt_linux.go | 2 +- pkg/snapshotters/annotations.go | 2 +- pkg/transfer/archive/exporter.go | 2 +- pkg/transfer/archive/importer.go | 2 +- pkg/transfer/local/import.go | 2 +- pkg/transfer/local/progress.go | 2 +- pkg/transfer/local/pull.go | 2 +- pkg/transfer/proxy/transfer.go | 2 +- pkg/transfer/registry/registry.go | 2 +- pkg/transfer/streaming/stream.go | 2 +- pkg/transfer/streaming/writer.go | 2 +- pkg/unpack/unpacker.go | 2 +- platforms/cpuinfo.go | 2 +- plugins/sandbox/controller.go | 2 +- plugins/transfer/plugin.go | 2 +- remotes/docker/auth/fetch.go | 2 +- remotes/docker/authorizer.go | 2 +- remotes/docker/config/hosts.go | 2 +- remotes/docker/config/hosts_test.go | 2 +- remotes/docker/converter.go | 2 +- remotes/docker/converter_fuzz.go | 2 +- remotes/docker/fetcher.go | 2 +- remotes/docker/handler.go | 2 +- remotes/docker/httpreadseeker.go | 2 +- remotes/docker/pusher.go | 2 +- remotes/docker/resolver.go | 2 +- remotes/docker/schema1/converter.go | 2 +- remotes/handlers.go | 2 +- rootfs/apply.go | 2 +- rootfs/init.go | 2 +- runtime/events.go | 2 +- runtime/restart/monitor/monitor.go | 2 +- runtime/restart/restart.go | 2 +- runtime/v2/README.md | 2 +- runtime/v2/binary.go | 2 +- runtime/v2/manager.go | 2 +- runtime/v2/runc/container.go | 2 +- runtime/v2/runc/manager/manager_linux.go | 2 +- runtime/v2/runc/pause/sandbox.go | 2 +- runtime/v2/runc/task/service.go | 2 +- runtime/v2/runc/util.go | 2 +- runtime/v2/shim.go | 2 +- runtime/v2/shim/publisher.go | 2 +- runtime/v2/shim/shim.go | 2 +- runtime/v2/shim/shim_unix.go | 2 +- runtime/v2/shim_load.go | 2 +- services/content/contentserver/contentserver.go | 2 +- services/images/local.go | 2 +- services/introspection/introspection.go | 2 +- services/sandbox/controller_service.go | 2 +- services/sandbox/store_service.go | 2 +- services/server/server.go | 2 +- services/server/server_linux.go | 2 +- services/snapshots/service.go | 2 +- services/streaming/service.go | 2 +- services/tasks/local.go | 2 +- services/transfer/service.go | 2 +- snapshots/benchsuite/benchmark_test.go | 2 +- snapshots/blockfile/blockfile.go | 2 +- snapshots/btrfs/btrfs.go | 2 +- snapshots/devmapper/pool_device.go | 2 +- snapshots/devmapper/pool_device_test.go | 2 +- snapshots/devmapper/snapshotter.go | 2 +- snapshots/devmapper/snapshotter_test.go | 2 +- snapshots/lcow/lcow.go | 2 +- snapshots/native/native.go | 2 +- snapshots/overlay/overlay.go | 2 +- snapshots/overlay/overlayutils/check.go | 2 +- snapshots/storage/metastore.go | 2 +- snapshots/testsuite/testsuite.go | 2 +- snapshots/windows/windows.go | 2 +- tracing/plugin/otlp.go | 2 +- 242 files changed, 245 insertions(+), 247 deletions(-) diff --git a/archive/compression/compression.go b/archive/compression/compression.go index 06bc94d03..fda32e0e4 100644 --- a/archive/compression/compression.go +++ b/archive/compression/compression.go @@ -28,7 +28,7 @@ import ( "strconv" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/klauspost/compress/zstd" exec "golang.org/x/sys/execabs" ) diff --git a/archive/tar.go b/archive/tar.go index a807f8205..bf189f53c 100644 --- a/archive/tar.go +++ b/archive/tar.go @@ -30,10 +30,10 @@ import ( "time" "github.com/containerd/containerd/archive/tarheader" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/continuity/fs" + "github.com/containerd/log" ) var bufPool = &sync.Pool{ diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go index bfe056f00..ffe836539 100644 --- a/archive/tar_linux_test.go +++ b/archive/tar_linux_test.go @@ -25,12 +25,12 @@ import ( "strings" "testing" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots/overlay/overlayutils" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" + "github.com/containerd/log/logtest" ) func TestOverlayApply(t *testing.T) { diff --git a/cio/io_windows.go b/cio/io_windows.go index f3d736a6d..59b14c42f 100644 --- a/cio/io_windows.go +++ b/cio/io_windows.go @@ -22,7 +22,7 @@ import ( "io" winio "github.com/Microsoft/go-winio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const pipeRoot = `\\.\pipe` diff --git a/cmd/containerd-stress/cri_worker.go b/cmd/containerd-stress/cri_worker.go index 99c5fbeac..bf8cb73b7 100644 --- a/cmd/containerd-stress/cri_worker.go +++ b/cmd/containerd-stress/cri_worker.go @@ -24,8 +24,8 @@ import ( "time" internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 757b02471..1dc877891 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/exec_worker.go b/cmd/containerd-stress/exec_worker.go index 0980b14c0..4acda4dd5 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-stress/main.go b/cmd/containerd-stress/main.go index e8ae9c8db..731e5eaed 100644 --- a/cmd/containerd-stress/main.go +++ b/cmd/containerd-stress/main.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/integration/remote" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/plugin" + "github.com/containerd/log" metrics "github.com/docker/go-metrics" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/size.go b/cmd/containerd-stress/size.go index 02908a864..113ba6aa4 100644 --- a/cmd/containerd-stress/size.go +++ b/cmd/containerd-stress/size.go @@ -19,7 +19,7 @@ package main import ( "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const defaultPath = "/usr/local/bin/" diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go index d8bf742b9..d6c5613de 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" ) type ctrWorker struct { diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 3b8e9739e..93f3a9a9d 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -29,13 +29,13 @@ import ( "github.com/containerd/containerd/defaults" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" _ "github.com/containerd/containerd/metrics" // import containerd build info "github.com/containerd/containerd/mount" "github.com/containerd/containerd/services/server" srvconfig "github.com/containerd/containerd/services/server/config" "github.com/containerd/containerd/sys" "github.com/containerd/containerd/version" + "github.com/containerd/log" "github.com/urfave/cli" "google.golang.org/grpc/grpclog" ) diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go index 927865a8d..ba52f8373 100644 --- a/cmd/containerd/command/main_unix.go +++ b/cmd/containerd/command/main_unix.go @@ -23,8 +23,8 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/services/server" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go index 182f4c007..94e33b5bc 100644 --- a/cmd/containerd/command/main_windows.go +++ b/cmd/containerd/command/main_windows.go @@ -26,8 +26,8 @@ import ( "github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/guid" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/services/server" + "github.com/containerd/log" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" ) diff --git a/cmd/containerd/command/notify_systemd.go b/cmd/containerd/command/notify_systemd.go index 101db5f72..6dc1ca3f9 100644 --- a/cmd/containerd/command/notify_systemd.go +++ b/cmd/containerd/command/notify_systemd.go @@ -23,7 +23,7 @@ import ( sd "github.com/coreos/go-systemd/v22/daemon" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // notifyReady notifies systemd that the daemon is ready to serve requests diff --git a/cmd/ctr/app/main.go b/cmd/ctr/app/main.go index e97a9f296..0a740dd1b 100644 --- a/cmd/ctr/app/main.go +++ b/cmd/ctr/app/main.go @@ -37,9 +37,9 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands/tasks" versionCmd "github.com/containerd/containerd/cmd/ctr/commands/version" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/version" + "github.com/containerd/log" "github.com/urfave/cli" "google.golang.org/grpc/grpclog" ) diff --git a/cmd/ctr/commands/client.go b/cmd/ctr/commands/client.go index 24639483a..4e944dc87 100644 --- a/cmd/ctr/commands/client.go +++ b/cmd/ctr/commands/client.go @@ -20,9 +20,9 @@ import ( gocontext "context" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/epoch" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 046c72a60..5ad88840d 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands/run" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index e3c011dd7..a1943f564 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/tasks" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index 277eda342..d6ce35b0e 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index d7ccb7ffa..90246361f 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -31,10 +31,10 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go index 6c55a54e0..f585330bc 100644 --- a/cmd/ctr/commands/content/prune.go +++ b/cmd/ctr/commands/content/prune.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/content" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go index a4247e055..c2ca925f5 100644 --- a/cmd/ctr/commands/events/events.go +++ b/cmd/ctr/commands/events/events.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 2856c7898..3722bf470 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -27,9 +27,9 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go index 2e3f3a6c3..1bfd3d9a8 100644 --- a/cmd/ctr/commands/images/import.go +++ b/cmd/ctr/commands/images/import.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/transfer" tarchive "github.com/containerd/containerd/pkg/transfer/archive" "github.com/containerd/containerd/pkg/transfer/image" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" ) var importCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go index 09b35d702..c77549764 100644 --- a/cmd/ctr/commands/images/pull.go +++ b/cmd/ctr/commands/images/pull.go @@ -28,12 +28,12 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/transfer/image" "github.com/containerd/containerd/pkg/transfer/registry" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index 0d6030daf..464a33527 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -30,7 +30,6 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/transfer/image" @@ -38,6 +37,7 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go index 745249c21..d2bb3b0a9 100644 --- a/cmd/ctr/commands/namespaces/namespaces.go +++ b/cmd/ctr/commands/namespaces/namespaces.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/resolver.go b/cmd/ctr/commands/resolver.go index 2c12acff5..c2bae2d2e 100644 --- a/cmd/ctr/commands/resolver.go +++ b/cmd/ctr/commands/resolver.go @@ -31,11 +31,11 @@ import ( "strings" "github.com/containerd/console" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/transfer/registry" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index 552ff5223..77c07bce4 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -35,8 +35,8 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" clabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" ) func withMounts(context *cli.Context) oci.SpecOpts { diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 29f3c9043..87b56482d 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -36,12 +36,12 @@ import ( "github.com/containerd/containerd/contrib/apparmor" "github.com/containerd/containerd/contrib/nvidia" "github.com/containerd/containerd/contrib/seccomp" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/intel/goresctrl/pkg/blockio" "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go index b6a8a96dc..fc3b939d6 100644 --- a/cmd/ctr/commands/run/run_windows.go +++ b/cmd/ctr/commands/run/run_windows.go @@ -25,10 +25,10 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/netns" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/sandboxes/sandboxes.go b/cmd/ctr/commands/sandboxes/sandboxes.go index ab9350d15..5d710ecad 100644 --- a/cmd/ctr/commands/sandboxes/sandboxes.go +++ b/cmd/ctr/commands/sandboxes/sandboxes.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index a49007650..56a6496ec 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -30,10 +30,10 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index 4a8e165d2..28d976ff6 100644 --- a/cmd/ctr/commands/signals.go +++ b/cmd/ctr/commands/signals.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type killer interface { diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index c8ace2d5b..58bddaeac 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -31,11 +31,11 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/tasks/attach.go b/cmd/ctr/commands/tasks/attach.go index 634419ec2..20fdf0512 100644 --- a/cmd/ctr/commands/tasks/attach.go +++ b/cmd/ctr/commands/tasks/attach.go @@ -20,7 +20,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/delete.go b/cmd/ctr/commands/tasks/delete.go index 027da1db0..5369f6217 100644 --- a/cmd/ctr/commands/tasks/delete.go +++ b/cmd/ctr/commands/tasks/delete.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index a7c1fb5ef..5ed9c3c17 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/kill.go b/cmd/ctr/commands/tasks/kill.go index 52211b65d..e22b7ca64 100644 --- a/cmd/ctr/commands/tasks/kill.go +++ b/cmd/ctr/commands/tasks/kill.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/log" gocni "github.com/containerd/go-cni" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/moby/sys/signal" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/tasks/start.go b/cmd/ctr/commands/tasks/start.go index 54681c01a..bedeb473b 100644 --- a/cmd/ctr/commands/tasks/start.go +++ b/cmd/ctr/commands/tasks/start.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go index e58d23142..a46f878fd 100644 --- a/cmd/ctr/commands/tasks/tasks_unix.go +++ b/cmd/ctr/commands/tasks/tasks_unix.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" "golang.org/x/sys/unix" ) diff --git a/cmd/ctr/commands/tasks/tasks_windows.go b/cmd/ctr/commands/tasks/tasks_windows.go index a202b14f7..4a804d869 100644 --- a/cmd/ctr/commands/tasks/tasks_windows.go +++ b/cmd/ctr/commands/tasks/tasks_windows.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/content/helpers.go b/content/helpers.go index 0161c8deb..b5f25e1a7 100644 --- a/content/helpers.go +++ b/content/helpers.go @@ -25,8 +25,8 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/content/local/store.go b/content/local/store.go index 5eb98e365..62a3c7ec1 100644 --- a/content/local/store.go +++ b/content/local/store.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/content/local/writer.go b/content/local/writer.go index b187e524c..f4ac2064b 100644 --- a/content/local/writer.go +++ b/content/local/writer.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ) diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go index e5ca57797..4c4f6b2e5 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index ba9ff008a..5af314584 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/archive" "github.com/containerd/containerd/content/local" imageArchive "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/apply/apply.go b/diff/apply/apply.go index 8e7a8bdaa..6f4754a31 100644 --- a/diff/apply/apply.go +++ b/diff/apply/apply.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index 5ab639358..afa5217d7 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -33,10 +33,10 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/stream_windows.go b/diff/stream_windows.go index dc9a0caf1..d43a9708d 100644 --- a/diff/stream_windows.go +++ b/diff/stream_windows.go @@ -29,9 +29,9 @@ import ( "github.com/Microsoft/go-winio" exec "golang.org/x/sys/execabs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf/proto" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/diff/walking/differ.go b/diff/walking/differ.go index 34a5797e7..7dfb5d571 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd/diff" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/epoch" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 2cfdfd71a..2669c955b 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -34,12 +34,12 @@ import ( "github.com/containerd/containerd/diff" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/events/exchange/exchange.go b/events/exchange/exchange.go index e18377c11..e1a5a33fa 100644 --- a/events/exchange/exchange.go +++ b/events/exchange/exchange.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" ) diff --git a/filters/filter.go b/filters/filter.go index e13f2625c..dcc569a4b 100644 --- a/filters/filter.go +++ b/filters/filter.go @@ -70,7 +70,7 @@ package filters import ( "regexp" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // Filter matches specific resources based the provided filter diff --git a/gc/scheduler/scheduler.go b/gc/scheduler/scheduler.go index 4a72906a4..51656c09b 100644 --- a/gc/scheduler/scheduler.go +++ b/gc/scheduler/scheduler.go @@ -24,8 +24,8 @@ import ( "time" "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" + "github.com/containerd/log" ) // config configures the garbage collection policies. diff --git a/images/archive/importer.go b/images/archive/importer.go index 3ca88091c..22a621814 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/converter/default.go b/images/converter/default.go index e44f856ba..1b3a55583 100644 --- a/images/converter/default.go +++ b/images/converter/default.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" diff --git a/images/diffid.go b/images/diffid.go index c031f8e36..3f873e493 100644 --- a/images/diffid.go +++ b/images/diffid.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // GetDiffID gets the diff ID of the layer blob descriptor. diff --git a/images/image.go b/images/image.go index 6acb93308..cba7bc13e 100644 --- a/images/image.go +++ b/images/image.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 490c2d645..b8f257862 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -23,12 +23,12 @@ import ( "testing" "github.com/containerd/containerd" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" ctrdsrv "github.com/containerd/containerd/services/server" srvconfig "github.com/containerd/containerd/services/server/config" + "github.com/containerd/log/logtest" _ "github.com/containerd/containerd/diff/walking/plugin" _ "github.com/containerd/containerd/events/plugin" diff --git a/integration/client/client.go b/integration/client/client.go index 4cb51534d..c72294efc 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" + "github.com/containerd/log/logtest" ) const ( diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 9b6f7068c..aec37b0ea 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -38,10 +38,10 @@ import ( "github.com/containerd/containerd/images" imagelist "github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" ) var ( diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 22954ec5c..5b4d16b4d 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -36,7 +36,6 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/platforms" @@ -46,6 +45,7 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/continuity/fs" "github.com/containerd/go-runc" + "github.com/containerd/log/logtest" "github.com/containerd/typeurl/v2" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" diff --git a/integration/client/go.mod b/integration/client/go.mod index 8683c03d3..ae44f9be6 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -10,6 +10,7 @@ require ( github.com/containerd/containerd v1.7.0 // see replace; the actual version of containerd is replaced with the code at the root of this repository github.com/containerd/continuity v0.4.2 github.com/containerd/go-runc v1.1.0 + github.com/containerd/log v0.1.0 github.com/containerd/ttrpc v1.2.2 github.com/containerd/typeurl/v2 v2.1.1 github.com/opencontainers/go-digest v1.0.0 @@ -29,7 +30,6 @@ require ( github.com/container-orchestrated-devices/container-device-interface v0.6.1 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/fifo v1.1.0 // indirect - github.com/containerd/log v0.1.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/distribution/reference v0.5.0 // indirect diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index 05ab6cc72..9f26d62d1 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -36,11 +36,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/content" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" criconfig "github.com/containerd/containerd/pkg/cri/config" criserver "github.com/containerd/containerd/pkg/cri/server" + "github.com/containerd/log" + "github.com/containerd/log/logtest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/images/image_list.go b/integration/images/image_list.go index 684d683e9..2de089449 100644 --- a/integration/images/image_list.go +++ b/integration/images/image_list.go @@ -22,7 +22,7 @@ import ( "os" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pelletier/go-toml" ) diff --git a/integration/main_test.go b/integration/main_test.go index 53c5d7ce4..ffe1e29a9 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -39,11 +39,11 @@ import ( _ "github.com/containerd/containerd/integration/images" // Keep this around to parse `imageListFile` command line var "github.com/containerd/containerd/integration/remote" dialer "github.com/containerd/containerd/integration/remote/util" - "github.com/containerd/containerd/log" criconfig "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/server" "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/log" "github.com/opencontainers/selinux/go-selinux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/metadata/containers_test.go b/metadata/containers_test.go index efcedae1e..7067b4f20 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/log/logtest" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/metadata/content.go b/metadata/content.go index 8e2166394..2126feaa6 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/db.go b/metadata/db.go index a187439ce..f11c53754 100644 --- a/metadata/db.go +++ b/metadata/db.go @@ -30,10 +30,10 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/events" "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cleanup" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/db_test.go b/metadata/db_test.go index c9f8d132f..ad860841e 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -36,11 +36,11 @@ import ( "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" + "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/metadata/gc.go b/metadata/gc.go index 855bcab51..da95b1c2d 100644 --- a/metadata/gc.go +++ b/metadata/gc.go @@ -26,7 +26,7 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/log" + "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/plugin/plugin.go b/metadata/plugin/plugin.go index 0dee5cb84..02c56806c 100644 --- a/metadata/plugin/plugin.go +++ b/metadata/plugin/plugin.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/pkg/timeout" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/snapshot.go b/metadata/snapshot.go index e7774d36e..328804089 100644 --- a/metadata/snapshot.go +++ b/metadata/snapshot.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index 0cc3e9787..fa74e9a46 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -25,9 +25,9 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime" + "github.com/containerd/log" "github.com/docker/go-metrics" ) diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go index 749dba117..2da46f9db 100644 --- a/metrics/cgroups/v1/metrics.go +++ b/metrics/cgroups/v1/metrics.go @@ -24,12 +24,12 @@ import ( "sync" cgroups "github.com/containerd/cgroups/v3/cgroup1" - "github.com/containerd/containerd/log" cmetrics "github.com/containerd/containerd/metrics" "github.com/containerd/containerd/metrics/cgroups/common" v1 "github.com/containerd/containerd/metrics/types/v1" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/timeout" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" diff --git a/metrics/cgroups/v1/oom.go b/metrics/cgroups/v1/oom.go index 7d3350202..8660c61b5 100644 --- a/metrics/cgroups/v1/oom.go +++ b/metrics/cgroups/v1/oom.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/unix" cgroups "github.com/containerd/cgroups/v3/cgroup1" - "github.com/containerd/containerd/log" + "github.com/containerd/log" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go index 00f5f40bc..49a3c3b69 100644 --- a/metrics/cgroups/v2/metrics.go +++ b/metrics/cgroups/v2/metrics.go @@ -23,12 +23,12 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/log" cmetrics "github.com/containerd/containerd/metrics" "github.com/containerd/containerd/metrics/cgroups/common" v2 "github.com/containerd/containerd/metrics/types/v2" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/timeout" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" diff --git a/mount/mount_windows.go b/mount/mount_windows.go index 7c24fa600..91ac6968d 100644 --- a/mount/mount_windows.go +++ b/mount/mount_windows.go @@ -27,7 +27,7 @@ import ( "github.com/Microsoft/go-winio/pkg/bindfilter" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/windows" ) diff --git a/mount/temp.go b/mount/temp.go index 83143521a..7849d0609 100644 --- a/mount/temp.go +++ b/mount/temp.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) var tempMountLocation = getTempDir() diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 050b445b8..9cc9bffe5 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/platforms" "github.com/containerd/continuity/fs" + "github.com/containerd/log" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/blockio/blockio_linux.go b/pkg/blockio/blockio_linux.go index c18e3bb11..4fca593db 100644 --- a/pkg/blockio/blockio_linux.go +++ b/pkg/blockio/blockio_linux.go @@ -25,7 +25,7 @@ import ( "github.com/intel/goresctrl/pkg/blockio" runtimespec "github.com/opencontainers/runtime-spec/specs-go" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) var ( diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go index 719812242..84b02afbd 100644 --- a/pkg/cri/config/config.go +++ b/pkg/cri/config/config.go @@ -23,7 +23,7 @@ import ( "net/url" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type SandboxControllerMode string diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 2eaa28d0e..4597b37a8 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -23,12 +23,12 @@ import ( "path/filepath" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/nri" "github.com/containerd/containerd/pkg/cri/sbserver" nriservice "github.com/containerd/containerd/pkg/nri" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" + "github.com/containerd/log" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "k8s.io/klog/v2" diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go index f8a77d420..98bcab97a 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -21,8 +21,8 @@ import ( "errors" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ctrdutil "github.com/containerd/containerd/pkg/cri/util" diff --git a/pkg/cri/io/container_io.go b/pkg/cri/io/container_io.go index ea7a35891..f6fc3b0b9 100644 --- a/pkg/cri/io/container_io.go +++ b/pkg/cri/io/container_io.go @@ -23,7 +23,7 @@ import ( "sync" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/containerd/pkg/cri/util" cioutil "github.com/containerd/containerd/pkg/ioutil" diff --git a/pkg/cri/io/exec_io.go b/pkg/cri/io/exec_io.go index 70fb98120..f5baf1f4f 100644 --- a/pkg/cri/io/exec_io.go +++ b/pkg/cri/io/exec_io.go @@ -21,8 +21,8 @@ import ( "sync" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" cioutil "github.com/containerd/containerd/pkg/ioutil" + "github.com/containerd/log" ) // ExecIO holds the exec io. diff --git a/pkg/cri/io/logger.go b/pkg/cri/io/logger.go index 69b55da4b..75bac2bea 100644 --- a/pkg/cri/io/logger.go +++ b/pkg/cri/io/logger.go @@ -25,8 +25,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/log" cioutil "github.com/containerd/containerd/pkg/ioutil" + "github.com/containerd/log" ) const ( diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index d17c72a8b..511e64d24 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -24,13 +24,13 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/blockio" "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/constants" cstore "github.com/containerd/containerd/pkg/cri/store/container" sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 1840d6cc5..4f67ac33a 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" ) // WithNewSnapshot wraps `containerd.WithNewSnapshot` so that if creating the diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go index f145360a0..bf1591c5c 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -32,8 +32,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" ) // Linux dependent OCI spec opts. diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index 791f6e4f8..3f8a379e3 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -32,10 +32,10 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/oci" osinterface "github.com/containerd/containerd/pkg/os" + "github.com/containerd/log" ) // WithMounts sorts and adds runtime and CRI mounts to the spec diff --git a/pkg/cri/sbserver/blockio_linux.go b/pkg/cri/sbserver/blockio_linux.go index bbc58d18f..1ccf10189 100644 --- a/pkg/cri/sbserver/blockio_linux.go +++ b/pkg/cri/sbserver/blockio_linux.go @@ -21,8 +21,8 @@ package sbserver import ( "fmt" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/blockio" + "github.com/containerd/log" ) // blockIOClassFromAnnotations examines container and pod annotations of a diff --git a/pkg/cri/sbserver/cni_conf_syncer.go b/pkg/cri/sbserver/cni_conf_syncer.go index dc0b917a1..c94bde502 100644 --- a/pkg/cri/sbserver/cni_conf_syncer.go +++ b/pkg/cri/sbserver/cni_conf_syncer.go @@ -22,8 +22,8 @@ import ( "path/filepath" "sync" - "github.com/containerd/containerd/log" "github.com/containerd/go-cni" + "github.com/containerd/log" "github.com/fsnotify/fsnotify" ) diff --git a/pkg/cri/sbserver/container_attach.go b/pkg/cri/sbserver/container_attach.go index 56f69c6a5..852707114 100644 --- a/pkg/cri/sbserver/container_attach.go +++ b/pkg/cri/sbserver/container_attach.go @@ -22,7 +22,7 @@ import ( "io" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_create.go b/pkg/cri/sbserver/container_create.go index ad523a520..f97b01e7d 100644 --- a/pkg/cri/sbserver/container_create.go +++ b/pkg/cri/sbserver/container_create.go @@ -35,7 +35,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/blockio" "github.com/containerd/containerd/pkg/cri/annotations" @@ -45,6 +44,7 @@ import ( containerstore "github.com/containerd/containerd/pkg/cri/store/container" "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/sbserver/container_execsync.go b/pkg/cri/sbserver/container_execsync.go index 3e4090f3e..8d62888e7 100644 --- a/pkg/cri/sbserver/container_execsync.go +++ b/pkg/cri/sbserver/container_execsync.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_remove.go b/pkg/cri/sbserver/container_remove.go index 9cc568f4b..83cde61a3 100644 --- a/pkg/cri/sbserver/container_remove.go +++ b/pkg/cri/sbserver/container_remove.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/container_start.go b/pkg/cri/sbserver/container_start.go index 15252a29e..ddc6b1122 100644 --- a/pkg/cri/sbserver/container_start.go +++ b/pkg/cri/sbserver/container_start.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" cio "github.com/containerd/containerd/pkg/cri/io" diff --git a/pkg/cri/sbserver/container_stats_list.go b/pkg/cri/sbserver/container_stats_list.go index d08d29ecb..72f441441 100644 --- a/pkg/cri/sbserver/container_stats_list.go +++ b/pkg/cri/sbserver/container_stats_list.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_stop.go b/pkg/cri/sbserver/container_stop.go index 925f202ee..8a83f48ba 100644 --- a/pkg/cri/sbserver/container_stop.go +++ b/pkg/cri/sbserver/container_stop.go @@ -25,10 +25,10 @@ import ( eventtypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/moby/sys/signal" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_update_resources.go b/pkg/cri/sbserver/container_update_resources.go index ab1923226..8e80bc29d 100644 --- a/pkg/cri/sbserver/container_update_resources.go +++ b/pkg/cri/sbserver/container_update_resources.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" diff --git a/pkg/cri/sbserver/events.go b/pkg/cri/sbserver/events.go index 5d8006e70..47b64292b 100644 --- a/pkg/cri/sbserver/events.go +++ b/pkg/cri/sbserver/events.go @@ -29,12 +29,12 @@ import ( containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/constants" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/utils/clock" diff --git a/pkg/cri/sbserver/helpers.go b/pkg/cri/sbserver/helpers.go index 68abc1e4d..c2f29d0f0 100644 --- a/pkg/cri/sbserver/helpers.go +++ b/pkg/cri/sbserver/helpers.go @@ -37,13 +37,13 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" clabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" imagestore "github.com/containerd/containerd/pkg/cri/store/image" runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" "github.com/containerd/containerd/plugin" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" ) // TODO: Move common helpers for sbserver and podsandbox to a dedicated package once basic services are functinal. diff --git a/pkg/cri/sbserver/helpers_linux.go b/pkg/cri/sbserver/helpers_linux.go index bd142ecc0..995558923 100644 --- a/pkg/cri/sbserver/helpers_linux.go +++ b/pkg/cri/sbserver/helpers_linux.go @@ -33,12 +33,12 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/containerd/pkg/seccomp" "github.com/containerd/containerd/pkg/seutil" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" ) // apparmorEnabled returns true if apparmor is enabled, supported by the host, diff --git a/pkg/cri/sbserver/images/image_pull.go b/pkg/cri/sbserver/images/image_pull.go index 40b17d80f..99c43732c 100644 --- a/pkg/cri/sbserver/images/image_pull.go +++ b/pkg/cri/sbserver/images/image_pull.go @@ -42,7 +42,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" crilabels "github.com/containerd/containerd/pkg/cri/labels" @@ -50,6 +49,7 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" distribution "github.com/distribution/reference" ) diff --git a/pkg/cri/sbserver/images/image_status.go b/pkg/cri/sbserver/images/image_status.go index c0d5216c2..9ca05df5e 100644 --- a/pkg/cri/sbserver/images/image_status.go +++ b/pkg/cri/sbserver/images/image_status.go @@ -24,9 +24,9 @@ import ( "strings" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" imagestore "github.com/containerd/containerd/pkg/cri/store/image" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" docker "github.com/distribution/reference" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/cri/sbserver/images/service.go b/pkg/cri/sbserver/images/service.go index 32865362d..6bf914bf6 100644 --- a/pkg/cri/sbserver/images/service.go +++ b/pkg/cri/sbserver/images/service.go @@ -22,12 +22,12 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" criconfig "github.com/containerd/containerd/pkg/cri/config" imagestore "github.com/containerd/containerd/pkg/cri/store/image" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" "github.com/containerd/containerd/pkg/kmutex" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" ) diff --git a/pkg/cri/sbserver/images/snapshots.go b/pkg/cri/sbserver/images/snapshots.go index 6bb06da45..87a58eb1d 100644 --- a/pkg/cri/sbserver/images/snapshots.go +++ b/pkg/cri/sbserver/images/snapshots.go @@ -22,10 +22,10 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" ctrdutil "github.com/containerd/containerd/pkg/cri/util" snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" ) // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats diff --git a/pkg/cri/sbserver/podsandbox/controller.go b/pkg/cri/sbserver/podsandbox/controller.go index 68ac86029..78944616c 100644 --- a/pkg/cri/sbserver/podsandbox/controller.go +++ b/pkg/cri/sbserver/podsandbox/controller.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" diff --git a/pkg/cri/sbserver/podsandbox/helpers.go b/pkg/cri/sbserver/podsandbox/helpers.go index 1c6e8a6c0..5e27c97db 100644 --- a/pkg/cri/sbserver/podsandbox/helpers.go +++ b/pkg/cri/sbserver/podsandbox/helpers.go @@ -26,11 +26,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" clabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" criconfig "github.com/containerd/containerd/pkg/cri/config" imagestore "github.com/containerd/containerd/pkg/cri/store/image" ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/log" docker "github.com/distribution/reference" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/sbserver/podsandbox/helpers_linux.go b/pkg/cri/sbserver/podsandbox/helpers_linux.go index f51e9907e..00505f878 100644 --- a/pkg/cri/sbserver/podsandbox/helpers_linux.go +++ b/pkg/cri/sbserver/podsandbox/helpers_linux.go @@ -29,11 +29,11 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/seccomp" "github.com/containerd/containerd/pkg/seutil" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/moby/sys/mountinfo" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/sbserver/podsandbox/opts.go b/pkg/cri/sbserver/podsandbox/opts.go index 539a2b3d5..57c8948a0 100644 --- a/pkg/cri/sbserver/podsandbox/opts.go +++ b/pkg/cri/sbserver/podsandbox/opts.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nri" v1 "github.com/containerd/nri/types/v1" ) diff --git a/pkg/cri/sbserver/podsandbox/recover.go b/pkg/cri/sbserver/podsandbox/recover.go index eb12cf665..13a47ac82 100644 --- a/pkg/cri/sbserver/podsandbox/recover.go +++ b/pkg/cri/sbserver/podsandbox/recover.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/log" ) // loadContainerTimeout is the default timeout for loading a container/sandbox. diff --git a/pkg/cri/sbserver/podsandbox/sandbox_delete.go b/pkg/cri/sbserver/podsandbox/sandbox_delete.go index 9b899f944..8ed438011 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_delete.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_delete.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd" apitasks "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) func (c *Controller) Shutdown(ctx context.Context, sandboxID string) error { diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run.go b/pkg/cri/sbserver/podsandbox/sandbox_run.go index 6ef941ccb..fc5cbd2c3 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_run.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_run.go @@ -32,7 +32,6 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" customopts "github.com/containerd/containerd/pkg/cri/opts" @@ -40,6 +39,7 @@ import ( ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/sandbox" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/sbserver/podsandbox/sandbox_stop.go b/pkg/cri/sbserver/podsandbox/sandbox_stop.go index 983399898..2e68d809a 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_stop.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_stop.go @@ -24,11 +24,11 @@ import ( eventtypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" + "github.com/containerd/log" ) func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error { diff --git a/pkg/cri/sbserver/rdt.go b/pkg/cri/sbserver/rdt.go index f0360ef5c..c03bce55e 100644 --- a/pkg/cri/sbserver/rdt.go +++ b/pkg/cri/sbserver/rdt.go @@ -21,8 +21,8 @@ package sbserver import ( "fmt" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/rdt" + "github.com/containerd/log" ) // rdtClassFromAnnotations examines container and pod annotations of a diff --git a/pkg/cri/sbserver/restart.go b/pkg/cri/sbserver/restart.go index f7596e9ef..8ed261842 100644 --- a/pkg/cri/sbserver/restart.go +++ b/pkg/cri/sbserver/restart.go @@ -28,11 +28,11 @@ import ( containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" criconfig "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/sbserver/podsandbox" "github.com/containerd/containerd/pkg/netns" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/runtime_config_linux.go b/pkg/cri/sbserver/runtime_config_linux.go index 502dfe90c..e5046d853 100644 --- a/pkg/cri/sbserver/runtime_config_linux.go +++ b/pkg/cri/sbserver/runtime_config_linux.go @@ -20,9 +20,9 @@ import ( "context" "sort" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/systemd" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_portforward_linux.go b/pkg/cri/sbserver/sandbox_portforward_linux.go index c6dd3cf55..1ff318a5f 100644 --- a/pkg/cri/sbserver/sandbox_portforward_linux.go +++ b/pkg/cri/sbserver/sandbox_portforward_linux.go @@ -23,7 +23,7 @@ import ( "net" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" ) diff --git a/pkg/cri/sbserver/sandbox_remove.go b/pkg/cri/sbserver/sandbox_remove.go index 41382ad0a..678ee6e01 100644 --- a/pkg/cri/sbserver/sandbox_remove.go +++ b/pkg/cri/sbserver/sandbox_remove.go @@ -22,7 +22,7 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_run.go b/pkg/cri/sbserver/sandbox_run.go index e86b867c5..0997aa5fd 100644 --- a/pkg/cri/sbserver/sandbox_run.go +++ b/pkg/cri/sbserver/sandbox_run.go @@ -31,7 +31,6 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/sbserver/podsandbox" @@ -40,6 +39,7 @@ import ( "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/netns" sb "github.com/containerd/containerd/sandbox" + "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/sbserver/sandbox_stats_linux.go b/pkg/cri/sbserver/sandbox_stats_linux.go index e6ff93055..93a4b94a8 100644 --- a/pkg/cri/sbserver/sandbox_stats_linux.go +++ b/pkg/cri/sbserver/sandbox_stats_linux.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/sandbox_stats_list.go b/pkg/cri/sbserver/sandbox_stats_list.go index 3e5ff1399..ea03c9bc7 100644 --- a/pkg/cri/sbserver/sandbox_stats_list.go +++ b/pkg/cri/sbserver/sandbox_stats_list.go @@ -22,8 +22,8 @@ import ( "fmt" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_stats_windows.go b/pkg/cri/sbserver/sandbox_stats_windows.go index b04691315..3c9d2dead 100644 --- a/pkg/cri/sbserver/sandbox_stats_windows.go +++ b/pkg/cri/sbserver/sandbox_stats_windows.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_stop.go b/pkg/cri/sbserver/sandbox_stop.go index dbd2b7ac8..3346364cf 100644 --- a/pkg/cri/sbserver/sandbox_stop.go +++ b/pkg/cri/sbserver/sandbox_stop.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" diff --git a/pkg/cri/sbserver/service.go b/pkg/cri/sbserver/service.go index 5231a28a7..29dbe4e36 100644 --- a/pkg/cri/sbserver/service.go +++ b/pkg/cri/sbserver/service.go @@ -28,7 +28,6 @@ import ( "sync/atomic" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/cri/instrument" "github.com/containerd/containerd/pkg/cri/nri" @@ -40,6 +39,7 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/sandbox" "github.com/containerd/go-cni" + "github.com/containerd/log" "google.golang.org/grpc" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/service_linux.go b/pkg/cri/sbserver/service_linux.go index 67a4865b9..fc113c493 100644 --- a/pkg/cri/sbserver/service_linux.go +++ b/pkg/cri/sbserver/service_linux.go @@ -22,10 +22,10 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/opencontainers/selinux/go-selinux" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cap" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/go-cni" + "github.com/containerd/log" ) // networkAttachCount is the minimum number of networks the PodSandbox diff --git a/pkg/cri/sbserver/status.go b/pkg/cri/sbserver/status.go index f8a857b8e..e2547fdba 100644 --- a/pkg/cri/sbserver/status.go +++ b/pkg/cri/sbserver/status.go @@ -22,7 +22,7 @@ import ( "fmt" goruntime "runtime" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/update_runtime_config.go b/pkg/cri/sbserver/update_runtime_config.go index fcab382d9..b609ec493 100644 --- a/pkg/cri/sbserver/update_runtime_config.go +++ b/pkg/cri/sbserver/update_runtime_config.go @@ -28,8 +28,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/atomicfile" + "github.com/containerd/log" ) // cniConfigTemplate contains the values containerd will overwrite diff --git a/pkg/cri/server/blockio_linux.go b/pkg/cri/server/blockio_linux.go index c1746d8e7..7d1e522ea 100644 --- a/pkg/cri/server/blockio_linux.go +++ b/pkg/cri/server/blockio_linux.go @@ -21,8 +21,8 @@ package server import ( "fmt" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/blockio" + "github.com/containerd/log" ) // blockIOClassFromAnnotations examines container and pod annotations of a diff --git a/pkg/cri/server/cni_conf_syncer.go b/pkg/cri/server/cni_conf_syncer.go index 8b5e4bc44..1efb8e2ea 100644 --- a/pkg/cri/server/cni_conf_syncer.go +++ b/pkg/cri/server/cni_conf_syncer.go @@ -22,8 +22,8 @@ import ( "path/filepath" "sync" - "github.com/containerd/containerd/log" cni "github.com/containerd/go-cni" + "github.com/containerd/log" "github.com/fsnotify/fsnotify" ) diff --git a/pkg/cri/server/container_attach.go b/pkg/cri/server/container_attach.go index cd79f3bfa..d7d0096d6 100644 --- a/pkg/cri/server/container_attach.go +++ b/pkg/cri/server/container_attach.go @@ -22,7 +22,7 @@ import ( "io" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index 15efb3e10..c54d79f22 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -33,13 +33,13 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" criconfig "github.com/containerd/containerd/pkg/cri/config" cio "github.com/containerd/containerd/pkg/cri/io" customopts "github.com/containerd/containerd/pkg/cri/opts" containerstore "github.com/containerd/containerd/pkg/cri/store/container" "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index b22281545..fa0d3fe0e 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_remove.go b/pkg/cri/server/container_remove.go index e8655315c..51b570fba 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 6132d573f..394bcd5a6 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" cio "github.com/containerd/containerd/pkg/cri/io" diff --git a/pkg/cri/server/container_stop.go b/pkg/cri/server/container_stop.go index 555a29a80..56fd3b263 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -25,10 +25,10 @@ import ( eventtypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/moby/sys/signal" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index 573510d07..55e83e9b4 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 163c1cf08..243ac6ac3 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -29,12 +29,12 @@ import ( containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/constants" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/utils/clock" diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 32018aab7..2765d728d 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -30,7 +30,6 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" clabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" imagestore "github.com/containerd/containerd/pkg/cri/store/image" @@ -38,6 +37,7 @@ import ( runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" "github.com/containerd/containerd/plugin" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" docker "github.com/distribution/reference" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go index d490ce881..5bcdb7039 100644 --- a/pkg/cri/server/helpers_linux.go +++ b/pkg/cri/server/helpers_linux.go @@ -29,12 +29,12 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/containerd/pkg/seccomp" "github.com/containerd/containerd/pkg/seutil" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/moby/sys/mountinfo" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go index 3c7955577..cef181aa5 100644 --- a/pkg/cri/server/image_pull.go +++ b/pkg/cri/server/image_pull.go @@ -40,7 +40,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" crilabels "github.com/containerd/containerd/pkg/cri/labels" @@ -48,6 +47,7 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" distribution "github.com/distribution/reference" ) diff --git a/pkg/cri/server/image_status.go b/pkg/cri/server/image_status.go index ccd664253..646414221 100644 --- a/pkg/cri/server/image_status.go +++ b/pkg/cri/server/image_status.go @@ -22,9 +22,9 @@ import ( "fmt" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" imagestore "github.com/containerd/containerd/pkg/cri/store/image" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/rdt_linux.go b/pkg/cri/server/rdt_linux.go index 5e83061a7..b45d24572 100644 --- a/pkg/cri/server/rdt_linux.go +++ b/pkg/cri/server/rdt_linux.go @@ -21,8 +21,8 @@ package server import ( "fmt" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/rdt" + "github.com/containerd/log" ) // rdtClassFromAnnotations examines container and pod annotations of a diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index f146fa16d..fa98e54d3 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -28,8 +28,8 @@ import ( containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/runtime_config_linux.go b/pkg/cri/server/runtime_config_linux.go index e58ef5f58..719db31eb 100644 --- a/pkg/cri/server/runtime_config_linux.go +++ b/pkg/cri/server/runtime_config_linux.go @@ -20,9 +20,9 @@ import ( "context" "sort" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/systemd" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_portforward_linux.go b/pkg/cri/server/sandbox_portforward_linux.go index c616f77b8..15256421d 100644 --- a/pkg/cri/server/sandbox_portforward_linux.go +++ b/pkg/cri/server/sandbox_portforward_linux.go @@ -23,7 +23,7 @@ import ( "net" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" ) diff --git a/pkg/cri/server/sandbox_remove.go b/pkg/cri/server/sandbox_remove.go index 1541a0a67..c440eb5be 100644 --- a/pkg/cri/server/sandbox_remove.go +++ b/pkg/cri/server/sandbox_remove.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 55e14e5a8..6268de828 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -36,7 +36,6 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" customopts "github.com/containerd/containerd/pkg/cri/opts" @@ -45,6 +44,7 @@ import ( "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/netns" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/server/sandbox_stats_linux.go b/pkg/cri/server/sandbox_stats_linux.go index 6b0c50eaf..028bf4e52 100644 --- a/pkg/cri/server/sandbox_stats_linux.go +++ b/pkg/cri/server/sandbox_stats_linux.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go index d237b18d4..233202c01 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/pkg/cri/server/sandbox_stats_list.go @@ -22,8 +22,8 @@ import ( "fmt" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stats_windows.go b/pkg/cri/server/sandbox_stats_windows.go index c6288565c..729238137 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/pkg/cri/server/sandbox_stats_windows.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go index c863911ae..5adca0a56 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -25,8 +25,8 @@ import ( eventtypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index ef154e648..5582b573c 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -28,7 +28,6 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/cri/instrument" "github.com/containerd/containerd/pkg/cri/nri" @@ -37,6 +36,7 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" cni "github.com/containerd/go-cni" + "github.com/containerd/log" "google.golang.org/grpc" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/service_linux.go b/pkg/cri/server/service_linux.go index 178b4540c..598a5e38b 100644 --- a/pkg/cri/server/service_linux.go +++ b/pkg/cri/server/service_linux.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cap" "github.com/containerd/containerd/pkg/userns" cni "github.com/containerd/go-cni" + "github.com/containerd/log" "github.com/opencontainers/selinux/go-selinux" ) diff --git a/pkg/cri/server/snapshots.go b/pkg/cri/server/snapshots.go index d86db5cdf..3f3bbd102 100644 --- a/pkg/cri/server/snapshots.go +++ b/pkg/cri/server/snapshots.go @@ -22,10 +22,10 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" ctrdutil "github.com/containerd/containerd/pkg/cri/util" snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" ) // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats diff --git a/pkg/cri/server/status.go b/pkg/cri/server/status.go index 7a702c57c..619ee7801 100644 --- a/pkg/cri/server/status.go +++ b/pkg/cri/server/status.go @@ -22,7 +22,7 @@ import ( "fmt" goruntime "runtime" - "github.com/containerd/containerd/log" + "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/update_runtime_config.go b/pkg/cri/server/update_runtime_config.go index 770e5980d..cf2e2abee 100644 --- a/pkg/cri/server/update_runtime_config.go +++ b/pkg/cri/server/update_runtime_config.go @@ -28,8 +28,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/atomicfile" + "github.com/containerd/log" ) // cniConfigTemplate contains the values containerd will overwrite diff --git a/pkg/imageverifier/bindir/bindir.go b/pkg/imageverifier/bindir/bindir.go index 3bf464591..0dc89d1c2 100644 --- a/pkg/imageverifier/bindir/bindir.go +++ b/pkg/imageverifier/bindir/bindir.go @@ -29,10 +29,9 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/imageverifier" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/sirupsen/logrus" ) const outputLimitBytes = 1 << 15 // 32 KiB @@ -188,7 +187,7 @@ func (v *ImageVerifier) runVerifier(ctx context.Context, bin string, imageName s }() // Pipe verifier stderr lines to debug logs. - stderrLog := log.G(ctx).Logger.WithFields(logrus.Fields{ + stderrLog := log.G(ctx).Logger.WithFields(log.Fields{ "image_verifier": bin, "stream": "stderr", }) diff --git a/pkg/imageverifier/bindir/bindir_test.go b/pkg/imageverifier/bindir/bindir_test.go index 7ea12ecbb..25b613b29 100644 --- a/pkg/imageverifier/bindir/bindir_test.go +++ b/pkg/imageverifier/bindir/bindir_test.go @@ -29,9 +29,8 @@ import ( "text/template" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -91,7 +90,7 @@ func newBinDir(t *testing.T, srcDir string, bins ...string) string { func TestBinDirVerifyImage(t *testing.T) { // Enable debug logs to easily see stderr for verifiers upon test failure. logger := log.L.Dup() - logger.Logger.SetLevel(logrus.DebugLevel) + logger.Logger.SetLevel(log.DebugLevel) ctx := log.WithLogger(context.Background(), logger) // Build verifiers from plain Go file. diff --git a/pkg/imageverifier/bindir/processes_windows.go b/pkg/imageverifier/bindir/processes_windows.go index 64bc4b51c..ed585cdf9 100644 --- a/pkg/imageverifier/bindir/processes_windows.go +++ b/pkg/imageverifier/bindir/processes_windows.go @@ -24,7 +24,7 @@ import ( "os/exec" "unsafe" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/windows" ) diff --git a/pkg/nri/domain.go b/pkg/nri/domain.go index db2dc28ca..d761ed2b0 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -22,8 +22,8 @@ import ( "sync" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/log" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/pkg/nri/nri.go b/pkg/nri/nri.go index 592b22e3e..0cf61a82d 100644 --- a/pkg/nri/nri.go +++ b/pkg/nri/nri.go @@ -22,7 +22,7 @@ import ( "path" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/containerd/version" nri "github.com/containerd/nri/pkg/adaptation" diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go index 224e3020d..1686230ec 100644 --- a/pkg/oom/v1/v1.go +++ b/pkg/oom/v1/v1.go @@ -25,10 +25,10 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/oom" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go index e4cb5c19b..63710e234 100644 --- a/pkg/oom/v2/v2.go +++ b/pkg/oom/v2/v2.go @@ -24,10 +24,10 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/oom" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" ) // New returns an implementation that listens to OOM events diff --git a/pkg/process/init.go b/pkg/process/init.go index 13de95a57..f4c3dcd89 100644 --- a/pkg/process/init.go +++ b/pkg/process/init.go @@ -32,12 +32,12 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/stdio" google_protobuf "github.com/containerd/containerd/protobuf/types" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" + "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" ) diff --git a/pkg/process/init_state.go b/pkg/process/init_state.go index 3c74a0870..df528e4db 100644 --- a/pkg/process/init_state.go +++ b/pkg/process/init_state.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/log" google_protobuf "github.com/containerd/containerd/protobuf/types" runc "github.com/containerd/go-runc" + "github.com/containerd/log" ) type initState interface { diff --git a/pkg/process/io.go b/pkg/process/io.go index a13b27c92..006645a81 100644 --- a/pkg/process/io.go +++ b/pkg/process/io.go @@ -31,11 +31,11 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/stdio" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" + "github.com/containerd/log" exec "golang.org/x/sys/execabs" ) diff --git a/pkg/rdt/rdt_linux.go b/pkg/rdt/rdt_linux.go index 99b7e5988..520ca3509 100644 --- a/pkg/rdt/rdt_linux.go +++ b/pkg/rdt/rdt_linux.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/intel/goresctrl/pkg/rdt" ) diff --git a/pkg/snapshotters/annotations.go b/pkg/snapshotters/annotations.go index c7ad97c15..63476376c 100644 --- a/pkg/snapshotters/annotations.go +++ b/pkg/snapshotters/annotations.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index 59ee899db..7e987c0b7 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/pkg/transfer/plugins" tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" ) func init() { diff --git a/pkg/transfer/archive/importer.go b/pkg/transfer/archive/importer.go index 7c8f528cc..d9a3df876 100644 --- a/pkg/transfer/archive/importer.go +++ b/pkg/transfer/archive/importer.go @@ -26,9 +26,9 @@ import ( transferapi "github.com/containerd/containerd/api/types/transfer" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" + "github.com/containerd/log" ) type ImportOpt func(*ImageImportStream) diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index 6ccc4f1f9..ae741bd65 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/unpack" + "github.com/containerd/log" ) func (ts *localTransferService) importStream(ctx context.Context, i transfer.ImageImporter, is transfer.ImageStorer, tops *transfer.Config) error { diff --git a/pkg/transfer/local/progress.go b/pkg/transfer/local/progress.go index 765651037..dcaedc371 100644 --- a/pkg/transfer/local/progress.go +++ b/pkg/transfer/local/progress.go @@ -23,9 +23,9 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index 9f30a68eb..3c77af7dd 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -24,11 +24,11 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" ) diff --git a/pkg/transfer/proxy/transfer.go b/pkg/transfer/proxy/transfer.go index 50dba0b37..2ad7a9449 100644 --- a/pkg/transfer/proxy/transfer.go +++ b/pkg/transfer/proxy/transfer.go @@ -25,10 +25,10 @@ import ( transferapi "github.com/containerd/containerd/api/services/transfer/v1" transfertypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/pkg/transfer" tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/registry/registry.go b/pkg/transfer/registry/registry.go index 441b29f64..fa60d88f8 100644 --- a/pkg/transfer/registry/registry.go +++ b/pkg/transfer/registry/registry.go @@ -26,13 +26,13 @@ import ( "sync" transfertypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/transfer/plugins" tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/streaming/stream.go b/pkg/transfer/streaming/stream.go index 061fd172d..c26764b94 100644 --- a/pkg/transfer/streaming/stream.go +++ b/pkg/transfer/streaming/stream.go @@ -27,8 +27,8 @@ import ( "time" transferapi "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/streaming/writer.go b/pkg/transfer/streaming/writer.go index ab43785ce..96e9837f3 100644 --- a/pkg/transfer/streaming/writer.go +++ b/pkg/transfer/streaming/writer.go @@ -23,8 +23,8 @@ import ( "sync/atomic" transferapi "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 43c963f90..f16b96888 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -33,13 +33,13 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/cleanup" "github.com/containerd/containerd/pkg/kmutex" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/platforms/cpuinfo.go b/platforms/cpuinfo.go index 8c600fc96..91f50e8c8 100644 --- a/platforms/cpuinfo.go +++ b/platforms/cpuinfo.go @@ -20,7 +20,7 @@ import ( "runtime" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // Present the ARM instruction set architecture, eg: v7, v8 diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index d295706b7..5214b6efd 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -26,13 +26,13 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime" v2 "github.com/containerd/containerd/runtime/v2" "github.com/containerd/containerd/sandbox" + "github.com/containerd/log" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index f30df506a..08fe35166 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -23,13 +23,13 @@ import ( "github.com/containerd/containerd/diff" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/pkg/imageverifier" "github.com/containerd/containerd/pkg/transfer/local" "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" + "github.com/containerd/log" // Load packages with type registrations _ "github.com/containerd/containerd/pkg/transfer/archive" diff --git a/remotes/docker/auth/fetch.go b/remotes/docker/auth/fetch.go index 64c6a38f9..244e03509 100644 --- a/remotes/docker/auth/fetch.go +++ b/remotes/docker/auth/fetch.go @@ -26,9 +26,9 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" remoteserrors "github.com/containerd/containerd/remotes/errors" "github.com/containerd/containerd/version" + "github.com/containerd/log" ) var ( diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go index 8fc823144..132305a9c 100644 --- a/remotes/docker/authorizer.go +++ b/remotes/docker/authorizer.go @@ -26,9 +26,9 @@ import ( "sync" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes/docker/auth" remoteerrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/log" ) type dockerAuthorizer struct { diff --git a/remotes/docker/config/hosts.go b/remotes/docker/config/hosts.go index dead8aa80..ed92c9470 100644 --- a/remotes/docker/config/hosts.go +++ b/remotes/docker/config/hosts.go @@ -33,8 +33,8 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/pelletier/go-toml" ) diff --git a/remotes/docker/config/hosts_test.go b/remotes/docker/config/hosts_test.go index a3941f026..710a18d85 100644 --- a/remotes/docker/config/hosts_test.go +++ b/remotes/docker/config/hosts_test.go @@ -25,8 +25,8 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log/logtest" ) const allCaps = docker.HostCapabilityPull | docker.HostCapabilityResolve | docker.HostCapabilityPush diff --git a/remotes/docker/converter.go b/remotes/docker/converter.go index d7dca0d36..95a68d70e 100644 --- a/remotes/docker/converter.go +++ b/remotes/docker/converter.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/converter_fuzz.go b/remotes/docker/converter_fuzz.go index caea6421a..fc6043751 100644 --- a/remotes/docker/converter_fuzz.go +++ b/remotes/docker/converter_fuzz.go @@ -24,7 +24,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index 0c50a086f..af538962e 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/handler.go b/remotes/docker/handler.go index 569dfa3de..045a50fb0 100644 --- a/remotes/docker/handler.go +++ b/remotes/docker/handler.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/reference" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/httpreadseeker.go b/remotes/docker/httpreadseeker.go index 9a827ef04..7e7790d2b 100644 --- a/remotes/docker/httpreadseeker.go +++ b/remotes/docker/httpreadseeker.go @@ -22,7 +22,7 @@ import ( "io" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const maxRetry = 3 diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index 161ec78b7..cc785930e 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" remoteserrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index 3d6c0182f..9e3d93b26 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -29,13 +29,13 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. remoteerrors "github.com/containerd/containerd/remotes/errors" "github.com/containerd/containerd/tracing" "github.com/containerd/containerd/version" + "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index 8c9e520cd..6b179ba3f 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -37,8 +37,8 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/handlers.go b/remotes/handlers.go index 874c83415..e17ef3def 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" ) diff --git a/rootfs/apply.go b/rootfs/apply.go index 35eae6d63..cc9a92ed9 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/diff" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/rootfs/init.go b/rootfs/init.go index 02d13bfc3..e6866ace2 100644 --- a/rootfs/init.go +++ b/rootfs/init.go @@ -22,9 +22,9 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ) diff --git a/runtime/events.go b/runtime/events.go index 761023016..29fc741a4 100644 --- a/runtime/events.go +++ b/runtime/events.go @@ -18,7 +18,7 @@ package runtime import ( "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/runtime/restart/monitor/monitor.go b/runtime/restart/monitor/monitor.go index dbf2eae20..f6e312968 100644 --- a/runtime/restart/monitor/monitor.go +++ b/runtime/restart/monitor/monitor.go @@ -24,10 +24,10 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime/restart" + "github.com/containerd/log" ) type duration struct { diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index 53a110b75..e71e9ec4d 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -39,7 +39,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/runtime/v2/README.md b/runtime/v2/README.md index a71ffa159..994b06a9d 100644 --- a/runtime/v2/README.md +++ b/runtime/v2/README.md @@ -351,7 +351,7 @@ If a shim does not or cannot implement an rpc call, it MUST return a `github.com A fifo on unix or named pipe on Windows will be provided to the shim. It can be located inside the `cwd` of the shim named "log". -The shims can use the existing `github.com/containerd/containerd/log` package to log debug messages. +The shims can use the existing `github.com/containerd/log` package to log debug messages. Messages will automatically be output in the containerd's daemon logs with the correct fields and runtime set. #### ttrpc diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 428551433..2c71c843c 100644 --- a/runtime/v2/binary.go +++ b/runtime/v2/binary.go @@ -26,13 +26,13 @@ import ( gruntime "runtime" "github.com/containerd/containerd/api/runtime/task/v2" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime" client "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" ) type shimBinaryConfig struct { diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index a90bbd8f8..e45de8c1f 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -28,7 +28,6 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cleanup" @@ -39,6 +38,7 @@ import ( "github.com/containerd/containerd/runtime" shimbinary "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/sandbox" + "github.com/containerd/log" ) // Config for the v2 runtime diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go index 448338561..a401c9450 100644 --- a/runtime/v2/runc/container.go +++ b/runtime/v2/runc/container.go @@ -32,12 +32,12 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/process" "github.com/containerd/containerd/pkg/stdio" "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/runtime/v2/runc/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go index 8d20d89e1..67d20c08a 100644 --- a/runtime/v2/runc/manager/manager_linux.go +++ b/runtime/v2/runc/manager/manager_linux.go @@ -29,7 +29,6 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" @@ -39,6 +38,7 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/shim" runcC "github.com/containerd/go-runc" + "github.com/containerd/log" exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/runtime/v2/runc/pause/sandbox.go b/runtime/v2/runc/pause/sandbox.go index aa0a31833..1156c81da 100644 --- a/runtime/v2/runc/pause/sandbox.go +++ b/runtime/v2/runc/pause/sandbox.go @@ -23,9 +23,9 @@ import ( "runtime" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/shutdown" "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" "github.com/containerd/ttrpc" api "github.com/containerd/containerd/api/runtime/sandbox/v1" diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go index 936321840..ff09c045a 100644 --- a/runtime/v2/runc/task/service.go +++ b/runtime/v2/runc/task/service.go @@ -31,7 +31,6 @@ import ( taskAPI "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/oom" oomv1 "github.com/containerd/containerd/pkg/oom/v1" @@ -48,6 +47,7 @@ import ( "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/sys/reaper" runcC "github.com/containerd/go-runc" + "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" ) diff --git a/runtime/v2/runc/util.go b/runtime/v2/runc/util.go index 611d93155..5a95c663d 100644 --- a/runtime/v2/runc/util.go +++ b/runtime/v2/runc/util.go @@ -22,8 +22,8 @@ import ( "context" "path/filepath" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/log" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index 0a47b90db..46452b55b 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -38,13 +38,13 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/pkg/timeout" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime" client "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" ) const ( diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go index b33d6a16b..009f50ba2 100644 --- a/runtime/v2/shim/publisher.go +++ b/runtime/v2/shim/publisher.go @@ -23,10 +23,10 @@ import ( v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/ttrpcutil" "github.com/containerd/containerd/protobuf" + "github.com/containerd/log" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 7455c55b3..9f945a0e6 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -31,13 +31,13 @@ import ( shimapi "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/shutdown" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/containerd/version" + "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/sirupsen/logrus" ) diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go index 62e46551e..a9504b698 100644 --- a/runtime/v2/shim/shim_unix.go +++ b/runtime/v2/shim/shim_unix.go @@ -27,9 +27,9 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/sys/reaper" "github.com/containerd/fifo" + "github.com/containerd/log" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index 70313b366..7b0b4c8b7 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -23,10 +23,10 @@ import ( "path/filepath" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cleanup" + "github.com/containerd/log" ) func (m *ShimManager) loadExistingTasks(ctx context.Context) error { diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index 683f883b0..769250c0f 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -25,9 +25,9 @@ import ( api "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" diff --git a/services/images/local.go b/services/images/local.go index 0c934bf66..5166c9a20 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -25,12 +25,12 @@ import ( "github.com/containerd/containerd/events" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/plugin" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" + "github.com/containerd/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/services/introspection/introspection.go b/services/introspection/introspection.go index 7f88af4f9..82954d5f4 100644 --- a/services/introspection/introspection.go +++ b/services/introspection/introspection.go @@ -21,8 +21,8 @@ import ( api "github.com/containerd/containerd/api/services/introspection/v1" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" ptypes "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/log" ) // Service defines the introspection service interface diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go index 64c7159cd..61682dc46 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -26,10 +26,10 @@ import ( api "github.com/containerd/containerd/api/services/sandbox/v1" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" + "github.com/containerd/log" ) func init() { diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go index a5a8a9c3f..5110a291c 100644 --- a/services/sandbox/store_service.go +++ b/services/sandbox/store_service.go @@ -24,9 +24,9 @@ import ( api "github.com/containerd/containerd/api/services/sandbox/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/sandbox" + "github.com/containerd/log" ) func init() { diff --git a/services/server/server.go b/services/server/server.go index a758a7fc9..96e6ee4bf 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -41,7 +41,6 @@ import ( "github.com/containerd/containerd/defaults" "github.com/containerd/containerd/diff" diffproxy "github.com/containerd/containerd/diff/proxy" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/pkg/timeout" "github.com/containerd/containerd/platforms" @@ -49,6 +48,7 @@ import ( srvconfig "github.com/containerd/containerd/services/server/config" ssproxy "github.com/containerd/containerd/snapshots/proxy" "github.com/containerd/containerd/sys" + "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/docker/go-metrics" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" diff --git a/services/server/server_linux.go b/services/server/server_linux.go index 63cf36a31..d1c219d2b 100644 --- a/services/server/server_linux.go +++ b/services/server/server_linux.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/log" srvconfig "github.com/containerd/containerd/services/server/config" "github.com/containerd/containerd/sys" + "github.com/containerd/log" "github.com/containerd/ttrpc" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/services/snapshots/service.go b/services/snapshots/service.go index 8a760f40c..5c1334338 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -22,12 +22,12 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "google.golang.org/grpc" ) diff --git a/services/streaming/service.go b/services/streaming/service.go index f7a8bee94..0e445f1a5 100644 --- a/services/streaming/service.go +++ b/services/streaming/service.go @@ -22,11 +22,11 @@ import ( api "github.com/containerd/containerd/api/services/streaming/v1" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "google.golang.org/grpc" ) diff --git a/services/tasks/local.go b/services/tasks/local.go index a7892a824..f17dd4bc4 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -35,7 +35,6 @@ import ( "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/blockio" @@ -48,6 +47,7 @@ import ( "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/services" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/transfer/service.go b/services/transfer/service.go index 4b48b159e..7f98c3ef0 100644 --- a/services/transfer/service.go +++ b/services/transfer/service.go @@ -22,12 +22,12 @@ import ( transferapi "github.com/containerd/containerd/api/services/transfer/v1" transferTypes "github.com/containerd/containerd/api/types/transfer" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/transfer/plugins" "github.com/containerd/containerd/plugin" ptypes "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 9aca157eb..f056309cf 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -32,12 +32,12 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/stretchr/testify/assert" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/devmapper" "github.com/containerd/containerd/snapshots/native" "github.com/containerd/containerd/snapshots/overlay" + "github.com/containerd/log" ) var ( diff --git a/snapshots/blockfile/blockfile.go b/snapshots/blockfile/blockfile.go index 7763b8990..11fefa930 100644 --- a/snapshots/blockfile/blockfile.go +++ b/snapshots/blockfile/blockfile.go @@ -24,12 +24,12 @@ import ( "path/filepath" "runtime" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/log" ) // viewHookHelper is only used in test for recover the filesystem. diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go index b91f0cb63..ce558c5f4 100644 --- a/snapshots/btrfs/btrfs.go +++ b/snapshots/btrfs/btrfs.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/btrfs/v2" "github.com/containerd/continuity/fs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" ) type snapshotter struct { diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go index b69489faa..d921fb884 100644 --- a/snapshots/devmapper/pool_device.go +++ b/snapshots/devmapper/pool_device.go @@ -28,9 +28,9 @@ import ( "golang.org/x/sys/unix" - "github.com/containerd/containerd/log" blkdiscard "github.com/containerd/containerd/snapshots/devmapper/blkdiscard" "github.com/containerd/containerd/snapshots/devmapper/dmsetup" + "github.com/containerd/log" ) // PoolDevice ties together data and metadata volumes, represents thin-pool and manages volumes, snapshots and device ids. diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go index da8abac1c..dc6b89ae2 100644 --- a/snapshots/devmapper/pool_device_test.go +++ b/snapshots/devmapper/pool_device_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots/devmapper/dmsetup" + "github.com/containerd/log" "github.com/docker/go-units" "github.com/stretchr/testify/assert" exec "golang.org/x/sys/execabs" diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index a96da4c45..1bc137d22 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -28,11 +28,11 @@ import ( "sync" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" exec "golang.org/x/sys/execabs" ) diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go index 72bcc2c3a..f0964eab3 100644 --- a/snapshots/devmapper/snapshotter_test.go +++ b/snapshots/devmapper/snapshotter_test.go @@ -29,13 +29,13 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/stretchr/testify/assert" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/log" ) func TestSnapshotterSuite(t *testing.T) { diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go index a0868e72d..bbcda4423 100644 --- a/snapshots/lcow/lcow.go +++ b/snapshots/lcow/lcow.go @@ -35,12 +35,12 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/snapshots/native/native.go b/snapshots/native/native.go index dba94b93f..5277b8179 100644 --- a/snapshots/native/native.go +++ b/snapshots/native/native.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" "github.com/containerd/continuity/fs" ) diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go index e566aa5c6..edd295778 100644 --- a/snapshots/overlay/overlay.go +++ b/snapshots/overlay/overlay.go @@ -26,12 +26,12 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/overlay/overlayutils" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/log" ) // upperdirKey is a key of an optional label to each snapshot. diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go index 75cf2ed8c..e94c95a88 100644 --- a/snapshots/overlay/overlayutils/check.go +++ b/snapshots/overlay/overlayutils/check.go @@ -27,10 +27,10 @@ import ( "golang.org/x/sys/unix" kernel "github.com/containerd/containerd/contrib/seccomp/kernelversion" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/continuity/fs" + "github.com/containerd/log" ) const ( diff --git a/snapshots/storage/metastore.go b/snapshots/storage/metastore.go index c0261731c..2f7beac1b 100644 --- a/snapshots/storage/metastore.go +++ b/snapshots/storage/metastore.go @@ -27,8 +27,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index 36982adab..2184cbf40 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -29,13 +29,13 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/randutil" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" "github.com/containerd/continuity/fs/fstest" + "github.com/containerd/log/logtest" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go index b96041b1e..c651f1d97 100644 --- a/snapshots/windows/windows.go +++ b/snapshots/windows/windows.go @@ -35,13 +35,13 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/ociwclayer" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go index 15a829143..0a390cc2d 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -24,9 +24,9 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace"