Merge pull request #45 from dweomer/list-all-pods

ps: list all containers

Author: dweomer

cmd/ps/ps.go

@@ -12,8 +12,8 @@ import (
 )
 
 type Ps struct {
-	A_All   bool   `usage:"Show all images (default hides intermediate images)"`
-	Format  string `usage:"Pretty-print images using a Go template"`
+	A_All   bool   `usage:"Show all containers"`
+	Format  string `usage:"Pretty-print containers using a Go template"`
 	NoTrunc bool   `usage:"Don't truncate output"`
 	Q_Quiet bool   `usage:"Only show numeric IDs"`
 }

pkg/daemon/container.go

@@ -3,20 +3,22 @@ package daemon
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/containerd/containerd/namespaces"
 	criutil "github.com/containerd/cri/pkg/containerd/util"
-	"github.com/rancher/k3c/pkg/defaults"
-
+	"github.com/containerd/cri/pkg/server"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/pkg/errors"
 	"github.com/rancher/k3c/pkg/client"
 	"github.com/rancher/k3c/pkg/daemon/volume"
+	"github.com/rancher/k3c/pkg/defaults"
 	"github.com/rancher/k3c/pkg/log"
 	"github.com/rancher/k3c/pkg/remote/apis/k3c/v1alpha1"
 	"github.com/sirupsen/logrus"
@@ -76,6 +78,7 @@ func (c *Daemon) LogContainer(ctx context.Context, containerID string, opts *v1.
 		opts = &v1.PodLogOptions{}
 	}
 
+	ctx = criutil.WithUnlisted(namespaces.WithNamespace(ctx, defaults.PublicNamespace), defaults.PrivateNamespace)
 	_, _, containerID, err := c.GetContainer(ctx, containerID)
 	if err != nil {
 		return nil, err
@@ -483,10 +486,21 @@ func boolPointer(priv bool) *bool {
 	return nil
 }
 
-func toContainer(mappings []*pb.PortMapping, volumes []v1.Volume, data *containerData) ([]v1.Volume, v1.Container, error) {
+func (c *Daemon) toContainer(ctx context.Context, mappings []*pb.PortMapping, volumes []v1.Volume, data *containerData) ([]v1.Volume, v1.Container, error) {
 	containerConfig, _, err := getContainerConfig(data.container)
 	if err != nil {
-		return nil, v1.Container{}, err
+		var (
+			req = &pb.ContainerStatusRequest{ContainerId: data.container.Id, Verbose: true}
+			res *pb.ContainerStatusResponse
+		)
+		if res, err = c.crt.ContainerStatus(ctx, req); err != nil {
+			return nil, v1.Container{}, err
+		}
+		var info server.ContainerInfo
+		if err = json.Unmarshal([]byte(res.Info["info"]), &info); err != nil {
+			return nil, v1.Container{}, err
+		}
+		containerConfig = info.Config
 	}
 
 	var (
@@ -510,10 +524,9 @@ func toContainer(mappings []*pb.PortMapping, volumes []v1.Volume, data *containe
 		}
 		ports = append(ports, cp)
 	}
-
-	return volumes, v1.Container{
+	container := v1.Container{
 		Name:          data.container.Metadata.Name,
-		Image:         data.container.Image.Image,
+		Image:         data.status.Image.Image,
 		Command:       containerConfig.Command,
 		Args:          containerConfig.Args,
 		WorkingDir:    containerConfig.WorkingDir,
@@ -541,7 +554,8 @@ func toContainer(mappings []*pb.PortMapping, volumes []v1.Volume, data *containe
 		Stdin:     containerConfig.GetStdin(),
 		StdinOnce: containerConfig.GetStdinOnce(),
 		TTY:       containerConfig.GetTty(),
-	}, nil
+	}
+	return volumes, container, nil
 }
 
 func addMount(volumes []v1.Volume, mounts []v1.VolumeMount, mount *pb.Mount) ([]v1.Volume, []v1.VolumeMount) {

pkg/daemon/pod.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	criutil "github.com/containerd/cri/pkg/containerd/util"
+	"github.com/containerd/cri/pkg/server"
 	"github.com/containernetworking/cni/pkg/types/current"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/google/uuid"
@@ -299,9 +300,9 @@ func (c *Daemon) listPods(ctx context.Context, network bool) ([]v1.Pod, error) {
 	}
 
 	for _, pod := range pods {
-		podResult, err := toPod(pod)
+		podResult, err := c.toPod(ctx, pod)
 		if err != nil {
-			logrus.Errorf("failed to convert pod %s: %v", pod.ID, err)
+			logrus.Warnf("failed to convert pod %s: %v", pod.ID, err)
 			continue
 		}
 		ips := ips[pod.ID]
@@ -494,10 +495,21 @@ func toPhase(podData *podData) v1.PodPhase {
 	return v1.PodPending
 }
 
-func toPod(podData *podData) (v1.Pod, error) {
+func (c *Daemon) toPod(ctx context.Context, podData *podData) (v1.Pod, error) {
 	podConfig, err := getPodConfig(podData.sandbox)
 	if err != nil {
-		return v1.Pod{}, err
+		var (
+			req = &pb.PodSandboxStatusRequest{PodSandboxId: podData.ID, Verbose: true}
+			res *pb.PodSandboxStatusResponse
+		)
+		if res, err = c.crt.PodSandboxStatus(ctx, req); err != nil {
+			return v1.Pod{}, err
+		}
+		var info server.SandboxInfo
+		if err = json.Unmarshal([]byte(res.Info["info"]), &info); err != nil {
+			return v1.Pod{}, err
+		}
+		podConfig = info.Config
 	}
 
 	pod := v1.Pod{
@@ -570,7 +582,7 @@ func toPod(podData *podData) (v1.Pod, error) {
 			pm = nil
 		}
 
-		volumes, container, err := toContainer(pm, pod.Spec.Volumes, container)
+		volumes, container, err := c.toContainer(ctx, pm, pod.Spec.Volumes, container)
 		if err == nil {
 			pod.Spec.Containers = append(pod.Spec.Containers, container)
 			pod.Spec.Volumes = volumes

pkg/tables/pods.go

@@ -24,7 +24,7 @@ func NewPods(cli *cli.Context) table.Writer {
 	cols := [][]string{
 		{"CONTAINER ID", "Status.containerID | id"},
 		{"IMAGE", "Container.image | formatImage"},
-		{"COMMAND", "Info.runtimeSpec.process.args | join \" \""},
+		{"COMMAND", "Info.runtimeSpec.process.args | join \" \" | formatCommand"},
 		{"CREATED", "Typed.Pod.CreationTimestamp | ago"},
 		{"STATUS", "Typed.Status | containerStatus"},
 		{"PORTS", "Typed.Container.Ports | formatPorts"},
@@ -34,11 +34,21 @@ func NewPods(cli *cli.Context) table.Writer {
 	w := table.NewWriter(cols, config(cli, "CONTAINER ID"))
 	w.AddFormatFunc("formatPorts", formatPorts)
 	w.AddFormatFunc("formatImage", formatImage)
+	w.AddFormatFunc("formatCommand", formatCommandFunc(cli))
 	w.AddFormatFunc("ago", ago)
 	w.AddFormatFunc("containerStatus", containerStatus)
 	return w
 }
 
+func formatCommandFunc(cli *cli.Context) table.FormatFunc {
+	return func(command string) (string, error) {
+		if !cli.Bool("no-trunc") && len(command) > 40 {
+			return command[:37] + `...`, nil
+		}
+		return command, nil
+	}
+}
+
 func formatPorts(ports []v1.ContainerPort) (string, error) {
 	var result strings.Builder
 	for _, port := range ports {