Merge pull request #5200 from pacoxu/skip-error-check

ctr plugin ls: plugin status should be skip, not error
This commit is contained in:
Michael Crosby
2021-03-16 11:48:56 -04:00
committed by GitHub

View File

@@ -26,6 +26,7 @@ import (
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/platforms"
pluginutils "github.com/containerd/containerd/plugin"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"
"google.golang.org/grpc/codes"
@@ -121,8 +122,12 @@ var listCommand = cli.Command{
status := "ok"
if plugin.InitErr != nil {
if strings.Contains(plugin.InitErr.Message, pluginutils.ErrSkipPlugin.Error()) {
status = "skip"
} else {
status = "error"
}
}
var platformColumn = "-"
if len(plugin.Platforms) > 0 {