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

crosbymichael · web-flow · commit 1a28c2f7ecf8 · 2021-03-16T11:48:56.000-04:00
ctr plugin ls: plugin status should be skip, not error
diff --git a/cmd/ctr/commands/plugins/plugins.go b/cmd/ctr/commands/plugins/plugins.go
@@ -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,7 +122,11 @@ var listCommand = cli.Command{
 			status := "ok"
 
 			if plugin.InitErr != nil {
-				status = "error"
+				if strings.Contains(plugin.InitErr.Message, pluginutils.ErrSkipPlugin.Error()) {
+					status = "skip"
+				} else {
+					status = "error"
+				}
 			}
 
 			var platformColumn = "-"
