Merge pull request #217 from Random-Liu/fix-sandbox-container-list

Fix container/sandbox list.

Author: Random-Liu

cmd/crictl/container.go

@@ -38,7 +38,7 @@ type containerByCreated []*pb.Container
 func (a containerByCreated) Len() int      { return len(a) }
 func (a containerByCreated) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
 func (a containerByCreated) Less(i, j int) bool {
-	return a[i].CreatedAt < a[j].CreatedAt
+	return a[i].CreatedAt > a[j].CreatedAt
 }
 
 type createOptions struct {
@@ -591,7 +591,6 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error {
 		return err
 	}
 	r.Containers = getContainersList(r.GetContainers(), opts)
-	sort.Sort(containerByCreated(r.Containers))
 
 	switch opts.output {
 	case "json":
@@ -655,6 +654,7 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error {
 }
 
 func getContainersList(containersList []*pb.Container, opts listOptions) []*pb.Container {
+	sort.Sort(containerByCreated(containersList))
 	n := len(containersList)
 	if opts.latest {
 		n = 1
@@ -669,5 +669,5 @@ func getContainersList(containersList []*pb.Container, opts listOptions) []*pb.C
 		return b
 	}(n, len(containersList))
 
-	return containersList[len(containersList)-n:]
+	return containersList[:n]
 }

cmd/crictl/sandbox.go

@@ -34,18 +34,12 @@ import (
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )
 
-type sandboxBySort []*pb.PodSandbox
+type sandboxByCreated []*pb.PodSandbox
 
-func (a sandboxBySort) Len() int      { return len(a) }
-func (a sandboxBySort) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a sandboxBySort) Less(i, j int) bool {
-	if a[i].Metadata.Namespace != a[j].Metadata.Namespace {
-		return a[i].Metadata.Namespace < a[j].Metadata.Namespace
-	}
-	if a[i].Metadata.Name != a[j].Metadata.Name {
-		return a[i].Metadata.Name < a[j].Metadata.Name
-	}
-	return a[i].CreatedAt < a[j].CreatedAt
+func (a sandboxByCreated) Len() int      { return len(a) }
+func (a sandboxByCreated) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a sandboxByCreated) Less(i, j int) bool {
+	return a[i].CreatedAt > a[j].CreatedAt
 }
 
 var runPodSandboxCommand = cli.Command{
@@ -172,12 +166,12 @@ var listPodSandboxCommand = cli.Command{
 			Usage: "filter by pod sandbox namespace",
 		},
 		cli.StringFlag{
-			Name:  "state,s",
+			Name:  "state, s",
 			Value: "",
 			Usage: "filter by pod sandbox state",
 		},
 		cli.StringSliceFlag{
-			Name:  "label,l",
+			Name:  "label",
 			Usage: "filter by key=value label",
 		},
 		cli.BoolFlag{
@@ -192,6 +186,14 @@ var listPodSandboxCommand = cli.Command{
 			Name:  "output, o",
 			Usage: "Output format, One of: json|yaml|table",
 		},
+		cli.BoolFlag{
+			Name:  "latest, l",
+			Usage: "Show recently created sandboxes",
+		},
+		cli.IntFlag{
+			Name:  "last, n",
+			Usage: "Show last n recently created sandboxes",
+		},
 		cli.BoolFlag{
 			Name:  "no-trunc",
 			Usage: "Show output without truncating the ID",
@@ -209,6 +211,8 @@ var listPodSandboxCommand = cli.Command{
 			verbose: context.Bool("verbose"),
 			quiet:   context.Bool("quiet"),
 			output:  context.String("output"),
+			latest:  context.Bool("latest"),
+			last:    context.Int("last"),
 			noTrunc: context.Bool("no-trunc"),
 		}
 		opts.labels, err = parseLabelStringSlice(context.StringSlice("label"))
@@ -401,7 +405,7 @@ func ListPodSandboxes(client pb.RuntimeServiceClient, opts listOptions) error {
 	if err != nil {
 		return err
 	}
-	sort.Sort(sandboxBySort(r.Items))
+	r.Items = getSandboxesList(r.GetItems(), opts)
 
 	switch opts.output {
 	case "json":
@@ -467,3 +471,22 @@ func ListPodSandboxes(client pb.RuntimeServiceClient, opts listOptions) error {
 	w.Flush()
 	return nil
 }
+
+func getSandboxesList(sandboxesList []*pb.PodSandbox, opts listOptions) []*pb.PodSandbox {
+	sort.Sort(sandboxByCreated(sandboxesList))
+	n := len(sandboxesList)
+	if opts.latest {
+		n = 1
+	}
+	if opts.last > 0 {
+		n = opts.last
+	}
+	n = func(a, b int) int {
+		if a < b {
+			return a
+		}
+		return b
+	}(n, len(sandboxesList))
+
+	return sandboxesList[:n]
+}