Merge pull request #361 from yanxuean/concise-imageid

show concise image info for crictl ps

cmd/crictl/container.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	units "github.com/docker/go-units"
+	godigest "github.com/opencontainers/go-digest"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
@@ -625,14 +626,17 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error {
 		ctm := units.HumanDuration(time.Now().UTC().Sub(createdAt)) + " ago"
 		if !opts.verbose {
 			id := c.Id
+			image := c.Image.Image
 			if !opts.noTrunc {
-				id = strings.TrimPrefix(c.Id, "")
-				if len(id) > truncatedIDLen {
-					id = id[:truncatedIDLen]
+				id = getTruncatedID(id, "")
+
+				// Now c.Image.Image is imageID in kubelet.
+				if digest, err := godigest.Parse(image); err == nil {
+					image = getTruncatedID(digest.String(), string(digest.Algorithm())+":")
 				}
 			}
 			fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%d\n",
-				id, c.Image.Image, ctm, convertContainerState(c.State), c.Metadata.Name, c.Metadata.Attempt)
+				id, image, ctm, convertContainerState(c.State), c.Metadata.Name, c.Metadata.Attempt)
 			continue
 		}
 

cmd/crictl/image.go

@@ -156,10 +156,7 @@ var listImageCommand = cli.Command{
 				size := units.HumanSizeWithPrecision(float64(image.GetSize_()), 3)
 				id := image.Id
 				if !noTrunc {
-					id = strings.TrimPrefix(image.Id, "sha256:")
-					if len(id) > truncatedIDLen {
-						id = id[:truncatedIDLen]
-					}
+					id = getTruncatedID(id, "sha256:")
 				}
 				for _, repoTagPair := range repoTagPairs {
 					if showDigest {

cmd/crictl/sandbox.go

@@ -453,10 +453,7 @@ func ListPodSandboxes(client pb.RuntimeServiceClient, opts listOptions) error {
 			ctm := units.HumanDuration(time.Now().UTC().Sub(createdAt)) + " ago"
 			id := pod.Id
 			if !opts.noTrunc {
-				id = strings.TrimPrefix(pod.Id, "")
-				if len(id) > truncatedIDLen {
-					id = id[:truncatedIDLen]
-				}
+				id = getTruncatedID(id, "")
 			}
 			fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%d\n",
 				id, ctm, convertPodState(pod.State), pod.Metadata.Name, pod.Metadata.Namespace, pod.Metadata.Attempt)

cmd/crictl/stats.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"os"
 	"sort"
-	"strings"
 	"text/tabwriter"
 	"time"
 
@@ -163,10 +162,7 @@ func ContainerStats(client pb.RuntimeServiceClient, opts statsOptions) error {
 	// Use `+` to work around go vet bug
 	fmt.Fprintln(w, "CONTAINER\tCPU %"+"\tMEM\tDISK\tINODES")
 	for _, s := range r.GetStats() {
-		id := strings.TrimPrefix(s.Attributes.Id, "")
-		if len(id) > truncatedIDLen {
-			id = id[:truncatedIDLen]
-		}
+		id := getTruncatedID(s.Attributes.Id, "")
 		cpu := s.GetCpu().GetUsageCoreNanoSeconds().GetValue()
 		mem := s.GetMemory().GetWorkingSetBytes().GetValue()
 		disk := s.GetWritableLayer().GetUsedBytes().GetValue()

cmd/crictl/util.go

@@ -294,3 +294,11 @@ func jsonFieldFromTag(tag reflect.StructTag) string {
 	}
 	return field
 }
+
+func getTruncatedID(id, prefix string) string {
+	id = strings.TrimPrefix(id, prefix)
+	if len(id) > truncatedIDLen {
+		id = id[:truncatedIDLen]
+	}
+	return id
+}

vendor.conf

@@ -15,6 +15,7 @@ github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
 github.com/onsi/ginkgo 67b9df7f55fe1165fd9ad49aca7754cce01a42b8
 github.com/onsi/gomega d59fa0ac68bb5dd932ee8d24eed631cdd519efc3
 github.com/opencontainers/selinux 4a2974bf1ee960774ffd517717f1f45325af0206
+github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
 github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4
 github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b
 github.com/urfave/cli 8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff