Skip to content

Commit 300a6de

Browse files
estespestesp
authored
Merge pull request #10269 from thaJeztah/1.7_migrate_containerd_log
[release/1.7] migrate log imports to github.com/containerd/log module
2 parents be820ac + 0af6825 commit 300a6de

185 files changed

Lines changed: 186 additions & 186 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎archive/compression/compression.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"strconv"
3030
"sync"
3131

32-
"github.com/containerd/containerd/log"
32+
"github.com/containerd/log"
3333
"github.com/klauspost/compress/zstd"
3434
)
3535

‎archive/tar.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import (
3030
"time"
3131

3232
"github.com/containerd/containerd/archive/tarheader"
33-
"github.com/containerd/containerd/log"
3433
"github.com/containerd/containerd/pkg/epoch"
3534
"github.com/containerd/containerd/pkg/userns"
3635
"github.com/containerd/continuity/fs"
36+
"github.com/containerd/log"
3737
)
3838

3939
var bufPool = &sync.Pool{

‎archive/tar_linux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/containerd/containerd/log/logtest"
2928
"github.com/containerd/containerd/mount"
3029
"github.com/containerd/containerd/pkg/testutil"
3130
"github.com/containerd/containerd/snapshots/overlay/overlayutils"
3231
"github.com/containerd/continuity/fs"
3332
"github.com/containerd/continuity/fs/fstest"
33+
"github.com/containerd/log/logtest"
3434
)
3535

3636
func TestOverlayApply(t *testing.T) {

‎cio/io_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"io"
2323

2424
winio "github.com/Microsoft/go-winio"
25-
"github.com/containerd/containerd/log"
25+
"github.com/containerd/log"
2626
)
2727

2828
const pipeRoot = `\\.\pipe`

‎cmd/containerd/command/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ import (
2828
"time"
2929

3030
"github.com/containerd/containerd/defaults"
31-
"github.com/containerd/containerd/log"
3231
_ "github.com/containerd/containerd/metrics" // import containerd build info
3332
"github.com/containerd/containerd/mount"
3433
"github.com/containerd/containerd/services/server"
3534
srvconfig "github.com/containerd/containerd/services/server/config"
3635
"github.com/containerd/containerd/sys"
3736
"github.com/containerd/containerd/version"
3837
"github.com/containerd/errdefs"
38+
"github.com/containerd/log"
3939
"github.com/urfave/cli"
4040
"google.golang.org/grpc/grpclog"
4141
)

‎cmd/containerd/command/main_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"os"
2424
"path/filepath"
2525

26-
"github.com/containerd/containerd/log"
2726
"github.com/containerd/containerd/services/server"
27+
"github.com/containerd/log"
2828
"golang.org/x/sys/unix"
2929
)
3030

‎cmd/containerd/command/main_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/Microsoft/go-winio/pkg/etw"
2727
"github.com/Microsoft/go-winio/pkg/etwlogrus"
2828
"github.com/Microsoft/go-winio/pkg/guid"
29-
"github.com/containerd/containerd/log"
3029
"github.com/containerd/containerd/services/server"
30+
"github.com/containerd/log"
3131
"github.com/sirupsen/logrus"
3232
"golang.org/x/sys/windows"
3333
)

‎cmd/containerd/command/notify_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
sd "github.com/coreos/go-systemd/v22/daemon"
2323

24-
"github.com/containerd/containerd/log"
24+
"github.com/containerd/log"
2525
)
2626

2727
// notifyReady notifies systemd that the daemon is ready to serve requests

‎cmd/ctr/commands/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"strconv"
2323

2424
"github.com/containerd/containerd"
25-
"github.com/containerd/containerd/log"
2625
"github.com/containerd/containerd/namespaces"
2726
"github.com/containerd/containerd/pkg/epoch"
2827
ptypes "github.com/containerd/containerd/protobuf/types"
28+
"github.com/containerd/log"
2929
"github.com/urfave/cli"
3030
)
3131

‎cmd/ctr/commands/containers/containers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/containerd/containerd/cmd/ctr/commands"
2929
"github.com/containerd/containerd/cmd/ctr/commands/run"
3030
"github.com/containerd/containerd/containers"
31-
"github.com/containerd/containerd/log"
3231
"github.com/containerd/errdefs"
32+
"github.com/containerd/log"
3333
"github.com/containerd/typeurl/v2"
3434
"github.com/urfave/cli"
3535
)

0 commit comments

Comments
 (0)