diff --git a/cmd/containerd-shim-runc-v1/main.go b/cmd/containerd-shim-runc-v1/main.go index b8a8df7b0..1b1b106aa 100644 --- a/cmd/containerd-shim-runc-v1/main.go +++ b/cmd/containerd-shim-runc-v1/main.go @@ -19,7 +19,7 @@ package main import ( - "github.com/containerd/containerd/runtime/v2/runc/v1" + v1 "github.com/containerd/containerd/runtime/v2/runc/v1" "github.com/containerd/containerd/runtime/v2/shim" ) diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go index 2ebe18ce2..4f5d804d9 100644 --- a/cmd/containerd-shim-runc-v2/main.go +++ b/cmd/containerd-shim-runc-v2/main.go @@ -19,7 +19,7 @@ package main import ( - "github.com/containerd/containerd/runtime/v2/runc/v2" + v2 "github.com/containerd/containerd/runtime/v2/runc/v2" "github.com/containerd/containerd/runtime/v2/shim" ) diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go index 507de4459..9c5934c1c 100644 --- a/cmd/ctr/commands/events/events.go +++ b/cmd/ctr/commands/events/events.go @@ -47,7 +47,7 @@ var Command = cli.Command{ var e *events.Envelope select { case e = <-eventsCh: - case err, open = <-errCh: + case err = <-errCh: return err } if e != nil { diff --git a/cmd/ctr/commands/plugins/plugins.go b/cmd/ctr/commands/plugins/plugins.go index df29441c4..a7f42192c 100644 --- a/cmd/ctr/commands/plugins/plugins.go +++ b/cmd/ctr/commands/plugins/plugins.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/platforms" - "github.com/opencontainers/image-spec/specs-go/v1" + v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" "google.golang.org/grpc/codes" ) diff --git a/images/archive/reference.go b/images/archive/reference.go index 19f419eaa..cd63517e5 100644 --- a/images/archive/reference.go +++ b/images/archive/reference.go @@ -91,7 +91,7 @@ func familiarizeReference(ref string) (string, error) { func ociReferenceName(name string) string { // OCI defines the reference name as only a tag excluding the // repository. The containerd annotation contains the full image name - // since the tag is insufficent for correctly naming and referring to an + // since the tag is insufficient for correctly naming and referring to an // image var ociRef string if spec, err := reference.Parse(name); err == nil { diff --git a/pkg/progress/escape.go b/pkg/progress/escape.go index 73505f69d..d9ce5b088 100644 --- a/pkg/progress/escape.go +++ b/pkg/progress/escape.go @@ -19,6 +19,6 @@ package progress const ( escape = "\x1b" reset = escape + "[0m" - red = escape + "[31m" // nolint: staticcheck, varcheck + red = escape + "[31m" // nolint: deadcode, varcheck, unused green = escape + "[32m" ) diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 2087509ba..22869a25c 100644 --- a/runtime/v2/binary.go +++ b/runtime/v2/binary.go @@ -87,7 +87,7 @@ func (b *binary) Start(ctx context.Context, opts *types.Any, onClose func()) (_ defer f.Close() if _, err := io.Copy(os.Stderr, f); err != nil { // When using a multi-container shim the 2nd to Nth container in the - // shim will not have a seperate log pipe. Ignore the failure log + // shim will not have a separate log pipe. Ignore the failure log // message here when the shim connect times out. if !os.IsNotExist(errors.Cause(err)) { log.G(ctx).WithError(err).Error("copy shim log") diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go index 6afa92db2..c9c540065 100644 --- a/runtime/v2/runc/container.go +++ b/runtime/v2/runc/container.go @@ -261,7 +261,7 @@ func (c *Container) Process(id string) (process.Process, error) { // ReserveProcess checks for the existence of an id and atomically // reserves the process id if it does not already exist // -// Returns true if the process id was sucessfully reserved and a +// Returns true if the process id was successfully reserved and a // cancel func to release the reservation func (c *Container) ReserveProcess(id string) (bool, func()) { c.mu.Lock() diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index a8efdbce3..41f908c3e 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -79,7 +79,7 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt defer f.Close() if _, err := io.Copy(os.Stderr, f); err != nil { // When using a multi-container shim the 2nd to Nth container in the - // shim will not have a seperate log pipe. Ignore the failure log + // shim will not have a separate log pipe. Ignore the failure log // message here when the shim connect times out. if !os.IsNotExist(errors.Cause(err)) { log.G(ctx).WithError(err).Error("copy shim log") diff --git a/services/tasks/local.go b/services/tasks/local.go index 78e384f87..63aff1b8a 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -43,7 +43,7 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/linux/runctypes" - "github.com/containerd/containerd/runtime/v2" + v2 "github.com/containerd/containerd/runtime/v2" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/services" "github.com/containerd/typeurl" diff --git a/windows/task.go b/windows/task.go index c2c23aff1..ebcfd789b 100644 --- a/windows/task.go +++ b/windows/task.go @@ -283,7 +283,7 @@ func (t *task) Update(ctx context.Context, resources *types.Any) error { func (t *task) Process(ctx context.Context, id string) (p runtime.Process, err error) { p = t.getProcess(id) - if p == nil { + if p == nil { // nolint: govet err = errors.Wrapf(errdefs.ErrNotFound, "no such process %s", id) }