diff --git a/.golangci.yml b/.golangci.yml index 8cb4b6f5cf..17cf1b6a2a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,12 @@ run: - pkg/remote/remotes linters-settings: + depguard: + rules: + main: + deny: + - pkg: "github.com/containerd/containerd/log" + desc: The containerd log package was migrated to a separate module. Use github.com/containerd/log instead. # govet: # check-shadowing: true # enable: @@ -34,6 +40,7 @@ linters-settings: linters: enable: + - depguard # Checks for imports that shouldn't be used. - staticcheck - unconvert - gofmt diff --git a/cmd/containerd-nydus-grpc/main.go b/cmd/containerd-nydus-grpc/main.go index 535a1637a9..203962d595 100644 --- a/cmd/containerd-nydus-grpc/main.go +++ b/cmd/containerd-nydus-grpc/main.go @@ -11,7 +11,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" "github.com/urfave/cli/v2" diff --git a/cmd/containerd-nydus-grpc/snapshotter.go b/cmd/containerd-nydus-grpc/snapshotter.go index 9d90b804a7..cb4dcd1b87 100644 --- a/cmd/containerd-nydus-grpc/snapshotter.go +++ b/cmd/containerd-nydus-grpc/snapshotter.go @@ -22,8 +22,8 @@ import ( api "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/contrib/snapshotservice" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "google.golang.org/grpc" ) diff --git a/cmd/optimizer-nri-plugin/main.go b/cmd/optimizer-nri-plugin/main.go index 6b3f13b366..b3e6646da9 100644 --- a/cmd/optimizer-nri-plugin/main.go +++ b/cmd/optimizer-nri-plugin/main.go @@ -16,8 +16,8 @@ import ( "strings" "time" + "github.com/containerd/log" "github.com/pkg/errors" - "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "github.com/containerd/containerd/reference/docker" @@ -122,18 +122,20 @@ type plugin struct { var ( cfg PluginConfig - log *logrus.Logger logWriter *syslog.Writer - _ = stub.ConfigureInterface(&plugin{}) globalFanotifyServer = make(map[string]*fanotify.Server) + + _ = stub.ConfigureInterface(&plugin{}) + _ = stub.StartContainerInterface(&plugin{}) + _ = stub.StopContainerInterface(&plugin{}) ) const ( imageNameLabel = "io.kubernetes.cri.image-name" ) -func (p *plugin) Configure(config, runtime, version string) (stub.EventMask, error) { - log.Infof("got configuration data: %q from runtime %s %s", config, runtime, version) +func (p *plugin) Configure(ctx context.Context, config, runtime, version string) (stub.EventMask, error) { + log.G(ctx).Infof("got configuration data: %q from runtime %s %s", config, runtime, version) if config == "" { return p.mask, nil } @@ -151,12 +153,12 @@ func (p *plugin) Configure(config, runtime, version string) (stub.EventMask, err return 0, errors.Wrap(err, "parse events in configuration") } - log.Infof("configuration: %#v", cfg) + log.G(ctx).Infof("configuration: %#v", cfg) return p.mask, nil } -func (p *plugin) StartContainer(_ *api.PodSandbox, container *api.Container) error { +func (p *plugin) StartContainer(_ context.Context, _ *api.PodSandbox, container *api.Container) error { dir, imageName, err := GetImageName(container.Annotations) if err != nil { return err @@ -183,7 +185,7 @@ func (p *plugin) StartContainer(_ *api.PodSandbox, container *api.Container) err return nil } -func (p *plugin) StopContainer(_ *api.PodSandbox, container *api.Container) ([]*api.ContainerUpdate, error) { +func (p *plugin) StopContainer(_ context.Context, _ *api.PodSandbox, container *api.Container) ([]*api.ContainerUpdate, error) { var update = []*api.ContainerUpdate{} _, imageName, err := GetImageName(container.Annotations) if err != nil { @@ -237,13 +239,13 @@ func main() { cfg = flags.Args.Config - log = logrus.StandardLogger() - log.SetFormatter(&logrus.TextFormatter{ - PadLevelText: true, - }) + // FIXME(thaJeztah): ucontainerd's log does not set "PadLevelText: true" + _ = log.SetFormat(log.TextFormat) + ctx := log.WithLogger(context.Background(), log.L) + logWriter, err = syslog.New(syslog.LOG_INFO, "optimizer-nri-plugin") if err == nil { - log.SetOutput(io.MultiWriter(os.Stdout, logWriter)) + log.G(ctx).Logger.SetOutput(io.MultiWriter(os.Stdout, logWriter)) } if flags.Args.PluginName != "" { @@ -256,17 +258,17 @@ func main() { p := &plugin{} if p.mask, err = api.ParseEventMask(flags.Args.PluginEvents); err != nil { - log.Fatalf("failed to parse events: %v", err) + log.G(ctx).Fatalf("failed to parse events: %v", err) } cfg.Events = strings.Split(flags.Args.PluginEvents, ",") if p.stub, err = stub.New(p, append(opts, stub.WithOnClose(p.onClose))...); err != nil { - log.Fatalf("failed to create plugin stub: %v", err) + log.G(ctx).Fatalf("failed to create plugin stub: %v", err) } err = p.stub.Run(context.Background()) if err != nil { - log.Errorf("plugin exited with error %v", err) + log.G(ctx).Errorf("plugin exited with error %v", err) os.Exit(1) } @@ -275,9 +277,9 @@ func main() { } if err := app.Run(os.Args); err != nil { if errdefs.IsConnectionClosed(err) { - log.Info("optimizer NRI plugin exited") + log.L.Info("optimizer NRI plugin exited") } else { - log.WithError(err).Fatal("failed to start optimizer NRI plugin") + log.L.WithError(err).Fatal("failed to start optimizer NRI plugin") } } } diff --git a/cmd/prefetchfiles-nri-plugin/main.go b/cmd/prefetchfiles-nri-plugin/main.go index b338a5bfbf..de9fbe5575 100644 --- a/cmd/prefetchfiles-nri-plugin/main.go +++ b/cmd/prefetchfiles-nri-plugin/main.go @@ -17,11 +17,11 @@ import ( "path/filepath" "strings" + "github.com/containerd/log" "github.com/containerd/nri/pkg/api" "github.com/containerd/nri/pkg/stub" "github.com/pelletier/go-toml" "github.com/pkg/errors" - "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "github.com/containerd/nydus-snapshotter/pkg/errdefs" @@ -83,8 +83,9 @@ type plugin struct { var ( globalSocket string - log *logrus.Logger logWriter *syslog.Writer + + _ = stub.RunPodInterface(&plugin{}) ) // sendDataOverHTTP sends the prefetch data to the specified endpoint over HTTP using a Unix socket. @@ -115,7 +116,7 @@ func sendDataOverHTTP(data string, endpoint, sock string) error { return nil } -func (p *plugin) RunPodSandbox(pod *api.PodSandbox) error { +func (p *plugin) RunPodSandbox(ctx context.Context, pod *api.PodSandbox) error { prefetchList, ok := pod.Annotations[nydusPrefetchAnnotation] if !ok { return nil @@ -123,7 +124,7 @@ func (p *plugin) RunPodSandbox(pod *api.PodSandbox) error { err := sendDataOverHTTP(prefetchList, endpointPrefetch, globalSocket) if err != nil { - log.Errorf("failed to send data: %v", err) + log.G(ctx).Errorf("failed to send data: %v", err) return err } @@ -131,7 +132,6 @@ func (p *plugin) RunPodSandbox(pod *api.PodSandbox) error { } func main() { - flags := NewPluginFlags() app := &cli.App{ @@ -146,7 +146,9 @@ func main() { err error ) - log = logrus.StandardLogger() + // FIXME(thaJeztah): ucontainerd's log does not set "PadLevelText: true" + _ = log.SetFormat(log.TextFormat) + ctx := log.WithLogger(context.Background(), log.L) configFileName := "prefetchConfig.toml" configDir := defaultPrefetchConfigDir @@ -154,7 +156,7 @@ func main() { config, err := toml.LoadFile(configFilePath) if err != nil { - log.Warnf("failed to read config file: %v", err) + log.G(ctx).Warnf("failed to read config file: %v", err) } configSocketAddrRaw := config.Get("file_prefetch.socket_address") @@ -162,19 +164,15 @@ func main() { if configSocketAddr, ok := configSocketAddrRaw.(string); ok { globalSocket = configSocketAddr } else { - log.Warnf("failed to read config: 'file_prefetch.socket_address' is not a string") + log.G(ctx).Warnf("failed to read config: 'file_prefetch.socket_address' is not a string") } } else { globalSocket = flags.Args.SocketAddress } - log.SetFormatter(&logrus.TextFormatter{ - PadLevelText: true, - }) logWriter, err = syslog.New(syslog.LOG_INFO, "prefetch-nri-plugin") - if err == nil { - log.SetOutput(io.MultiWriter(os.Stdout, logWriter)) + log.G(ctx).Logger.SetOutput(io.MultiWriter(os.Stdout, logWriter)) } if flags.Args.PluginName != "" { @@ -187,11 +185,11 @@ func main() { p := &plugin{} if p.mask, err = api.ParseEventMask(defaultEvents); err != nil { - log.Fatalf("failed to parse events: %v", err) + log.G(ctx).Fatalf("failed to parse events: %v", err) } if p.stub, err = stub.New(p, opts...); err != nil { - log.Fatalf("failed to create plugin stub: %v", err) + log.G(ctx).Fatalf("failed to create plugin stub: %v", err) } err = p.stub.Run(context.Background()) @@ -202,11 +200,10 @@ func main() { }, } if err := app.Run(os.Args); err != nil { - if errdefs.IsConnectionClosed(err) { - log.Info("prefetch NRI plugin exited") + log.L.Info("prefetch NRI plugin exited") } else { - log.WithError(err).Fatal("failed to start prefetch NRI plugin") + log.L.WithError(err).Fatal("failed to start prefetch NRI plugin") } } } diff --git a/config/daemonconfig/fscache.go b/config/daemonconfig/fscache.go index cc7bcde081..7c9911cb62 100644 --- a/config/daemonconfig/fscache.go +++ b/config/daemonconfig/fscache.go @@ -11,7 +11,7 @@ import ( "os" "path" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/auth" "github.com/containerd/nydus-snapshotter/pkg/utils/erofs" diff --git a/config/daemonconfig/mirrors.go b/config/daemonconfig/mirrors.go index 116b0e2caa..ed32a95233 100644 --- a/config/daemonconfig/mirrors.go +++ b/config/daemonconfig/mirrors.go @@ -15,7 +15,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pelletier/go-toml" "github.com/pkg/errors" ) diff --git a/config/global.go b/config/global.go index 3c1906073a..61bee2d2cb 100644 --- a/config/global.go +++ b/config/global.go @@ -14,7 +14,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" "github.com/containerd/nydus-snapshotter/internal/logging" diff --git a/go.mod b/go.mod index 93af640cef..0f78f78f20 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/containerd/nydus-snapshotter go 1.19 require ( - github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 + github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 github.com/KarpelesLab/reflink v1.0.1 github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible github.com/aws/aws-sdk-go-v2 v1.17.6 @@ -11,19 +11,20 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.16 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56 github.com/containerd/cgroups v1.1.0 - github.com/containerd/cgroups/v3 v3.0.1 - github.com/containerd/containerd v1.7.0 - github.com/containerd/continuity v0.3.0 + github.com/containerd/cgroups/v3 v3.0.2 + github.com/containerd/containerd v1.7.7 + github.com/containerd/continuity v0.4.2 github.com/containerd/fifo v1.1.0 - github.com/containerd/nri v0.3.0 + github.com/containerd/log v0.1.0 + github.com/containerd/nri v0.4.0 github.com/containerd/stargz-snapshotter v0.14.3 github.com/containerd/stargz-snapshotter/estargz v0.14.3 github.com/containers/ocicrypt v1.1.7 github.com/distribution/reference v0.5.0 - github.com/docker/cli v23.0.1+incompatible + github.com/docker/cli v23.0.3+incompatible github.com/freddierice/go-losetup v0.0.0-20220711213114-2a14873012db github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da - github.com/google/go-containerregistry v0.13.0 + github.com/google/go-containerregistry v0.14.0 github.com/gorilla/mux v1.8.0 github.com/hashicorp/go-retryablehttp v0.7.2 github.com/imdario/mergo v0.3.13 @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_golang v1.14.0 github.com/prometheus/client_model v0.3.0 github.com/rs/xid v1.4.0 - github.com/sirupsen/logrus v1.9.0 - github.com/stretchr/testify v1.8.3 + github.com/sirupsen/logrus v1.9.3 + github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.25.0 go.etcd.io/bbolt v1.3.7 golang.org/x/exp v0.0.0-20231006140011-7918f672742d @@ -56,9 +57,9 @@ require ( ) require ( - github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 // indirect - github.com/Microsoft/go-winio v0.6.0 // indirect - github.com/Microsoft/hcsshim v0.10.0-rc.7 // indirect + github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/hcsshim v0.11.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 // indirect @@ -77,11 +78,10 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cilium/ebpf v0.9.1 // indirect - github.com/containerd/ttrpc v1.2.1 // indirect - github.com/containerd/typeurl/v2 v2.1.0 // indirect + github.com/containerd/ttrpc v1.2.2 // indirect + github.com/containerd/typeurl/v2 v2.1.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v23.0.3+incompatible // indirect diff --git a/go.sum b/go.sum index 5b08546849..86f13d9a07 100644 --- a/go.sum +++ b/go.sum @@ -1,16 +1,16 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= -github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 h1:+vTEFqeoeur6XSq06bs+roX3YiT49gUniJK7Zky7Xjg= -github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= +github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/KarpelesLab/reflink v1.0.1 h1:d+tdjliwOCqvub9bl0Y02GxahWkNqejNb3TZTTUcQWA= github.com/KarpelesLab/reflink v1.0.1/go.mod h1:WGkTOKNjd1FsJKBw3mu4JvrPEDJyJJ+JPtxBkbPoCok= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= -github.com/Microsoft/hcsshim v0.10.0-rc.7 h1:HBytQPxcv8Oy4244zbQbe6hnOnx544eL5QPUqhJldz8= -github.com/Microsoft/hcsshim v0.10.0-rc.7/go.mod h1:ILuwjA+kNW+MrN/w5un7n3mTqkwsFu4Bp05/okFUZlE= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/hcsshim v0.11.1 h1:hJ3s7GbWlGK4YVV92sO88BQSyF4ZLVy7/awqOlPxFbA= +github.com/Microsoft/hcsshim v0.11.1/go.mod h1:nFJmaO4Zr5Y7eADdFOpYswDDlNVbvcIJJNJLECr5JQg= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible h1:KXeJoM1wo9I/6xPTyt6qCxoSZnmASiAjlrr0dyTUKt8= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= @@ -70,25 +70,27 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= -github.com/containerd/cgroups/v3 v3.0.1 h1:4hfGvu8rfGIwVIDd+nLzn/B9ZXx4BcCjzt5ToenJRaE= -github.com/containerd/cgroups/v3 v3.0.1/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.0 h1:G/ZQr3gMZs6ZT0qPUZ15znx5QSdQdASW11nXTLTM2Pg= -github.com/containerd/containerd v1.7.0/go.mod h1:QfR7Efgb/6X2BDpTPJRvPTYDE9rsF0FsXX9J8sIs/sc= -github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= -github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= +github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4= +github.com/containerd/containerd v1.7.7/go.mod h1:3c4XZv6VeT9qgf9GMTxNTMFxGJrGpI2vz1yk4ye+YY8= +github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= +github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= -github.com/containerd/nri v0.3.0 h1:2ZM4WImye1ypSnE7COjOvPAiLv84kaPILBDvb1tbDK8= -github.com/containerd/nri v0.3.0/go.mod h1:Zw9q2lP16sdg0zYybemZ9yTDy8g7fPCIB3KXOGlggXI= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/containerd/nri v0.4.0 h1:PjgIBm0RtUiFyEO6JqPBQZRQicbsIz41Fz/5VSC0zgw= +github.com/containerd/nri v0.4.0/go.mod h1:Zw9q2lP16sdg0zYybemZ9yTDy8g7fPCIB3KXOGlggXI= github.com/containerd/stargz-snapshotter v0.14.3 h1:OTUVZoPSPs8mGgmQUE1dqw3WX/3nrsmsurW7UPLWl1U= github.com/containerd/stargz-snapshotter v0.14.3/go.mod h1:j2Ya4JeA5gMZJr8BchSkPjlcCEh++auAxp4nidPI6N0= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= -github.com/containerd/ttrpc v1.2.1 h1:VWv/Rzx023TBLv4WQ+9WPXlBG/s3rsRjY3i9AJ2BJdE= -github.com/containerd/ttrpc v1.2.1/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= -github.com/containerd/typeurl/v2 v2.1.0 h1:yNAhJvbNEANt7ck48IlEGOxP7YAp6LLpGn5jZACDNIE= -github.com/containerd/typeurl/v2 v2.1.0/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0= +github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs= +github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= +github.com/containerd/typeurl/v2 v2.1.1 h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4= +github.com/containerd/typeurl/v2 v2.1.1/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0= github.com/containers/ocicrypt v1.1.7 h1:thhNr4fu2ltyGz8aMx8u48Ae0Pnbip3ePP9/mzkZ/3U= github.com/containers/ocicrypt v1.1.7/go.mod h1:7CAhjcj2H8AYp5YvEie7oVSK2AhBY8NscCYRawuDNtw= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -98,15 +100,14 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v23.0.1+incompatible h1:LRyWITpGzl2C9e9uGxzisptnxAn1zfZKXy13Ul2Q5oM= -github.com/docker/cli v23.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v23.0.3+incompatible h1:Zcse1DuDqBdgI7OQDV8Go7b83xLgfhW1eza4HfEdxpY= +github.com/docker/cli v23.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v23.0.3+incompatible h1:9GhVsShNWz1hO//9BNg/dpMnZW25KydO4wtVxWAIbho= @@ -191,8 +192,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.13.0 h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k= -github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo= +github.com/google/go-containerregistry v0.14.0 h1:z58vMqHxuwvAsVwvKEkmVBz2TlgBgH5k6koEXBtlYkw= +github.com/google/go-containerregistry v0.14.0/go.mod h1:aiJ2fp/SXvkWgmYHioXnbMdlgB8eXiiYOY55gfN91Wk= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -315,8 +316,8 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -333,8 +334,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= diff --git a/internal/logging/setup.go b/internal/logging/setup.go index 62204bcc6f..21b8297d2c 100644 --- a/internal/logging/setup.go +++ b/internal/logging/setup.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" "github.com/sirupsen/logrus" lumberjack "gopkg.in/natefinch/lumberjack.v2" diff --git a/internal/logging/setup_test.go b/internal/logging/setup_test.go index f6bb724908..47af47c401 100644 --- a/internal/logging/setup_test.go +++ b/internal/logging/setup_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/sirupsen/logrus" "gotest.tools/assert" ) diff --git a/pkg/auth/image_proxy.go b/pkg/auth/image_proxy.go index c7b0a56b81..eac12b06b1 100644 --- a/pkg/auth/image_proxy.go +++ b/pkg/auth/image_proxy.go @@ -12,11 +12,11 @@ import ( "time" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/reference" distribution "github.com/containerd/containerd/reference/docker" runtime_alpha "github.com/containerd/containerd/third_party/k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + "github.com/containerd/log" "github.com/containerd/stargz-snapshotter/service/keychain/cri" "github.com/containerd/stargz-snapshotter/service/keychain/crialpha" "github.com/containerd/stargz-snapshotter/service/resolver" diff --git a/pkg/cache/manager.go b/pkg/cache/manager.go index 7dc70a380e..ab9e7640fb 100644 --- a/pkg/cache/manager.go +++ b/pkg/cache/manager.go @@ -14,9 +14,9 @@ import ( "github.com/pkg/errors" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" "github.com/containerd/continuity/fs" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/store" ) diff --git a/pkg/cgroup/manager.go b/pkg/cgroup/manager.go index 0ca9dd0b63..f0010808d0 100644 --- a/pkg/cgroup/manager.go +++ b/pkg/cgroup/manager.go @@ -7,7 +7,7 @@ package cgroup import ( - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type Manager struct { diff --git a/pkg/cgroup/v1/v1.go b/pkg/cgroup/v1/v1.go index 4dab8498b5..b737a8a1b6 100644 --- a/pkg/cgroup/v1/v1.go +++ b/pkg/cgroup/v1/v1.go @@ -8,7 +8,7 @@ package v1 import ( "github.com/containerd/cgroups/v3/cgroup1" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/pkg/cgroup/v2/v2.go b/pkg/cgroup/v2/v2.go index 719295cc90..0102b895dd 100644 --- a/pkg/cgroup/v2/v2.go +++ b/pkg/cgroup/v2/v2.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/exp/slices" ) diff --git a/pkg/daemon/client.go b/pkg/daemon/client.go index 54feaa2f2a..a1b13bafbc 100644 --- a/pkg/daemon/client.go +++ b/pkg/daemon/client.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/daemon/types" "github.com/containerd/nydus-snapshotter/pkg/metrics/tool" "github.com/containerd/nydus-snapshotter/pkg/utils/retry" diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index 8bd955cdcc..2c3a68603b 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -18,7 +18,7 @@ import ( "github.com/pkg/errors" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/config/daemonconfig" diff --git a/pkg/filesystem/fs.go b/pkg/filesystem/fs.go index 60b093dc6b..0bb9d8012c 100644 --- a/pkg/filesystem/fs.go +++ b/pkg/filesystem/fs.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/config/daemonconfig" diff --git a/pkg/filesystem/stargz_adaptor.go b/pkg/filesystem/stargz_adaptor.go index 2948a62ae9..69eaf304a4 100644 --- a/pkg/filesystem/stargz_adaptor.go +++ b/pkg/filesystem/stargz_adaptor.go @@ -17,8 +17,8 @@ import ( "time" "github.com/KarpelesLab/reflink" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/pkg/auth" "github.com/containerd/nydus-snapshotter/pkg/label" diff --git a/pkg/filesystem/tarfs_adaptor.go b/pkg/filesystem/tarfs_adaptor.go index 5d95ad51cb..ccc1231fb9 100755 --- a/pkg/filesystem/tarfs_adaptor.go +++ b/pkg/filesystem/tarfs_adaptor.go @@ -9,9 +9,9 @@ package filesystem import ( "context" - "github.com/containerd/containerd/log" snpkg "github.com/containerd/containerd/pkg/snapshotters" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/label" "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/pkg/manager/daemon_adaptor.go b/pkg/manager/daemon_adaptor.go index e1335c1d6b..44c61fbea4 100644 --- a/pkg/manager/daemon_adaptor.go +++ b/pkg/manager/daemon_adaptor.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" "github.com/containerd/nydus-snapshotter/config" diff --git a/pkg/manager/daemon_cache.go b/pkg/manager/daemon_cache.go index 8e42e603ee..bc4c027b71 100644 --- a/pkg/manager/daemon_cache.go +++ b/pkg/manager/daemon_cache.go @@ -10,7 +10,7 @@ package manager import ( "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/daemon" ) diff --git a/pkg/manager/daemon_event.go b/pkg/manager/daemon_event.go index 2eea237b00..e4b4454d33 100644 --- a/pkg/manager/daemon_event.go +++ b/pkg/manager/daemon_event.go @@ -10,7 +10,7 @@ package manager import ( "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/pkg/daemon" "github.com/containerd/nydus-snapshotter/pkg/daemon/types" diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index 27b6fad7d6..5e4cf88951 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -14,7 +14,7 @@ import ( "path/filepath" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" "github.com/containerd/nydus-snapshotter/config" diff --git a/pkg/manager/monitor.go b/pkg/manager/monitor.go index 1664aeb960..a14c5e9fa8 100644 --- a/pkg/manager/monitor.go +++ b/pkg/manager/monitor.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/daemon/types" "github.com/containerd/nydus-snapshotter/pkg/errdefs" "github.com/containerd/nydus-snapshotter/pkg/metrics/collector" diff --git a/pkg/metrics/collector/daemon.go b/pkg/metrics/collector/daemon.go index ddf1a2f32d..196ea4b990 100644 --- a/pkg/metrics/collector/daemon.go +++ b/pkg/metrics/collector/daemon.go @@ -7,7 +7,7 @@ package collector import ( - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/daemon/types" "github.com/containerd/nydus-snapshotter/pkg/metrics/data" ) diff --git a/pkg/metrics/collector/fs.go b/pkg/metrics/collector/fs.go index da9172f264..9effabee8e 100644 --- a/pkg/metrics/collector/fs.go +++ b/pkg/metrics/collector/fs.go @@ -9,7 +9,7 @@ package collector import ( "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/daemon/types" "github.com/containerd/nydus-snapshotter/pkg/metrics/data" mtypes "github.com/containerd/nydus-snapshotter/pkg/metrics/types" diff --git a/pkg/metrics/collector/snapshotter.go b/pkg/metrics/collector/snapshotter.go index 1e614286dc..d3e3333f6c 100644 --- a/pkg/metrics/collector/snapshotter.go +++ b/pkg/metrics/collector/snapshotter.go @@ -9,8 +9,8 @@ package collector import ( "context" - "github.com/containerd/containerd/log" "github.com/containerd/continuity/fs" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/metrics/data" "github.com/containerd/nydus-snapshotter/pkg/metrics/tool" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/metrics/listener.go b/pkg/metrics/listener.go index 65c8a5ebd4..08451699b2 100644 --- a/pkg/metrics/listener.go +++ b/pkg/metrics/listener.go @@ -12,7 +12,7 @@ import ( "net" "net/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/metrics/registry" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/pkg/metrics/serve.go b/pkg/metrics/serve.go index 7c46c57b2e..34a2561a5c 100644 --- a/pkg/metrics/serve.go +++ b/pkg/metrics/serve.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/pkg/daemon/types" "github.com/containerd/nydus-snapshotter/pkg/manager" diff --git a/pkg/metrics/tool/common.go b/pkg/metrics/tool/common.go index af76cff5b0..66c3996bcc 100644 --- a/pkg/metrics/tool/common.go +++ b/pkg/metrics/tool/common.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/pkg/pprof/listener.go b/pkg/pprof/listener.go index 99bb38655f..c260b1acbc 100644 --- a/pkg/pprof/listener.go +++ b/pkg/pprof/listener.go @@ -11,7 +11,7 @@ import ( "net/http" "net/http/pprof" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" ) diff --git a/pkg/prefetch/prefetch.go b/pkg/prefetch/prefetch.go index 6f2d01cd3d..6f8ebda384 100644 --- a/pkg/prefetch/prefetch.go +++ b/pkg/prefetch/prefetch.go @@ -10,7 +10,7 @@ import ( "encoding/json" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type prefetchInfo struct { diff --git a/pkg/referrer/manager.go b/pkg/referrer/manager.go index 1134457d99..b8f153659e 100644 --- a/pkg/referrer/manager.go +++ b/pkg/referrer/manager.go @@ -9,7 +9,7 @@ package referrer import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/auth" "github.com/golang/groupcache/lru" "github.com/opencontainers/go-digest" diff --git a/pkg/remote/remote.go b/pkg/remote/remote.go index cbcd0a08b7..ce287baa46 100644 --- a/pkg/remote/remote.go +++ b/pkg/remote/remote.go @@ -13,13 +13,12 @@ import ( "net/http" "strings" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/auth" - "github.com/distribution/reference" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - "github.com/containerd/nydus-snapshotter/pkg/remote/remotes" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/docker" + "github.com/distribution/reference" + "github.com/pkg/errors" ) // IsErrHTTPResponseToHTTPSClient returns whether err is @@ -106,7 +105,7 @@ func (remote *Remote) RetryWithPlainHTTP(ref string, err error) bool { // If the error message includes the current registry host string, it // implies that we can retry the request with plain HTTP. if strings.Contains(err.Error(), fmt.Sprintf("/%s/", host)) { - logrus.WithError(err).Warningf("retrying with http for %s", host) + log.G(context.TODO()).WithError(err).Warningf("retrying with http for %s", host) remote.withPlainHTTP = true } } diff --git a/pkg/remote/remotes/docker/auth/fetch.go b/pkg/remote/remotes/docker/auth/fetch.go index 10ed2e62c9..996aba0c6e 100644 --- a/pkg/remote/remotes/docker/auth/fetch.go +++ b/pkg/remote/remotes/docker/auth/fetch.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/version" + "github.com/containerd/log" remoteserrors "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/errors" ) diff --git a/pkg/remote/remotes/docker/authorizer.go b/pkg/remote/remotes/docker/authorizer.go index 1f7b696afd..3c8e300fca 100644 --- a/pkg/remote/remotes/docker/authorizer.go +++ b/pkg/remote/remotes/docker/authorizer.go @@ -26,7 +26,7 @@ import ( "sync" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/docker/auth" remoteerrors "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/errors" ) diff --git a/pkg/remote/remotes/docker/config/hosts.go b/pkg/remote/remotes/docker/config/hosts.go index b127a438ad..22e7d1a53f 100644 --- a/pkg/remote/remotes/docker/config/hosts.go +++ b/pkg/remote/remotes/docker/config/hosts.go @@ -33,7 +33,7 @@ import ( "time" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/docker" "github.com/pelletier/go-toml" ) diff --git a/pkg/remote/remotes/docker/converter.go b/pkg/remote/remotes/docker/converter.go index 66864d7002..129dea8fc8 100644 --- a/pkg/remote/remotes/docker/converter.go +++ b/pkg/remote/remotes/docker/converter.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/remote/remotes/docker/converter_fuzz.go b/pkg/remote/remotes/docker/converter_fuzz.go index 9082053924..aa7cf4666f 100644 --- a/pkg/remote/remotes/docker/converter_fuzz.go +++ b/pkg/remote/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" "github.com/sirupsen/logrus" ) diff --git a/pkg/remote/remotes/docker/fetcher.go b/pkg/remote/remotes/docker/fetcher.go index bfe00172ac..21c0918c5e 100644 --- a/pkg/remote/remotes/docker/fetcher.go +++ b/pkg/remote/remotes/docker/fetcher.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/remote/remotes/docker/handler.go b/pkg/remote/remotes/docker/handler.go index 27638ccc02..ccec490133 100644 --- a/pkg/remote/remotes/docker/handler.go +++ b/pkg/remote/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/pkg/remote/remotes/docker/httpreadseeker.go b/pkg/remote/remotes/docker/httpreadseeker.go index 9a827ef04c..7e7790d2b3 100644 --- a/pkg/remote/remotes/docker/httpreadseeker.go +++ b/pkg/remote/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/pkg/remote/remotes/docker/pusher.go b/pkg/remote/remotes/docker/pusher.go index 24b63c00cd..f82b99f6ec 100644 --- a/pkg/remote/remotes/docker/pusher.go +++ b/pkg/remote/remotes/docker/pusher.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes" remoteserrors "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/errors" digest "github.com/opencontainers/go-digest" diff --git a/pkg/remote/remotes/docker/referrers.go b/pkg/remote/remotes/docker/referrers.go index d240eb42a2..aa2eb201e8 100644 --- a/pkg/remote/remotes/docker/referrers.go +++ b/pkg/remote/remotes/docker/referrers.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/remote/remotes/docker/resolver.go b/pkg/remote/remotes/docker/resolver.go index 99c941bd67..9c380a35d0 100644 --- a/pkg/remote/remotes/docker/resolver.go +++ b/pkg/remote/remotes/docker/resolver.go @@ -29,10 +29,10 @@ 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/tracing" "github.com/containerd/containerd/version" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. remoteerrors "github.com/containerd/nydus-snapshotter/pkg/remote/remotes/errors" diff --git a/pkg/remote/remotes/docker/schema1/converter.go b/pkg/remote/remotes/docker/schema1/converter.go index 9d9ad9ab6d..39ac74a28a 100644 --- a/pkg/remote/remotes/docker/schema1/converter.go +++ b/pkg/remote/remotes/docker/schema1/converter.go @@ -37,7 +37,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/remote/remotes" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/pkg/remote/remotes/handlers.go b/pkg/remote/remotes/handlers.go index 31de555164..8f00898608 100644 --- a/pkg/remote/remotes/handlers.go +++ b/pkg/remote/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/pkg/snapshot/storage.go b/pkg/snapshot/storage.go index ea03b9aa58..3a6f973af0 100644 --- a/pkg/snapshot/storage.go +++ b/pkg/snapshot/storage.go @@ -9,9 +9,9 @@ package snapshot import ( "context" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/errdefs" "github.com/pkg/errors" ) diff --git a/pkg/stargz/resolver.go b/pkg/stargz/resolver.go index bed128f927..2182aee057 100644 --- a/pkg/stargz/resolver.go +++ b/pkg/stargz/resolver.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/reference/docker" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/utils/transport" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" diff --git a/pkg/store/database.go b/pkg/store/database.go index dfa5b0ca38..c227a4a59e 100644 --- a/pkg/store/database.go +++ b/pkg/store/database.go @@ -14,7 +14,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/daemon" "github.com/containerd/nydus-snapshotter/pkg/errdefs" "github.com/containerd/nydus-snapshotter/pkg/rafs" diff --git a/pkg/store/database_compat.go b/pkg/store/database_compat.go index 53edb402d5..afd731000c 100644 --- a/pkg/store/database_compat.go +++ b/pkg/store/database_compat.go @@ -14,7 +14,7 @@ import ( "path" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/pkg/daemon" "github.com/containerd/nydus-snapshotter/pkg/errdefs" diff --git a/pkg/supervisor/supervisor.go b/pkg/supervisor/supervisor.go index c22f8aea34..2705c9ee5f 100644 --- a/pkg/supervisor/supervisor.go +++ b/pkg/supervisor/supervisor.go @@ -16,7 +16,7 @@ import ( "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/errdefs" "github.com/pkg/errors" diff --git a/pkg/system/system.go b/pkg/system/system.go index 1c866d22ee..6852eae1b0 100644 --- a/pkg/system/system.go +++ b/pkg/system/system.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/gorilla/mux" "github.com/pkg/errors" diff --git a/pkg/tarfs/tarfs.go b/pkg/tarfs/tarfs.go index afe96839ee..aa7250f96b 100755 --- a/pkg/tarfs/tarfs.go +++ b/pkg/tarfs/tarfs.go @@ -22,8 +22,8 @@ import ( "syscall" "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/pkg/auth" "github.com/containerd/nydus-snapshotter/pkg/errdefs" diff --git a/pkg/utils/erofs/erofs.go b/pkg/utils/erofs/erofs.go index f50ced04aa..6c71aaf59d 100644 --- a/pkg/utils/erofs/erofs.go +++ b/pkg/utils/erofs/erofs.go @@ -9,7 +9,7 @@ package erofs import ( "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/pkg/utils/transport/pool.go b/pkg/utils/transport/pool.go index 989730cc89..81c5898ed2 100644 --- a/pkg/utils/transport/pool.go +++ b/pkg/utils/transport/pool.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/utils/registry" "github.com/golang/groupcache/lru" "github.com/google/go-containerregistry/pkg/authn" diff --git a/snapshot/mount_option.go b/snapshot/mount_option.go index 50624e73de..d0161e726b 100644 --- a/snapshot/mount_option.go +++ b/snapshot/mount_option.go @@ -15,10 +15,10 @@ import ( "os" "strings" - "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/nydus-snapshotter/config/daemonconfig" "github.com/containerd/nydus-snapshotter/pkg/label" "github.com/containerd/nydus-snapshotter/pkg/layout" diff --git a/snapshot/snapshot.go b/snapshot/snapshot.go index 27134ffe32..3b6a61946b 100644 --- a/snapshot/snapshot.go +++ b/snapshot/snapshot.go @@ -16,12 +16,12 @@ import ( "github.com/pkg/errors" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" snpkg "github.com/containerd/containerd/pkg/snapshotters" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/config" "github.com/containerd/nydus-snapshotter/config/daemonconfig" "github.com/containerd/nydus-snapshotter/pkg/rafs" diff --git a/tests/converter_test.go b/tests/converter_test.go index bb4baf81a8..bf436daccb 100644 --- a/tests/converter_test.go +++ b/tests/converter_test.go @@ -31,9 +31,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/containerd/containerd" containerdconverter "github.com/containerd/containerd/images/converter" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require"