From 46b74a8ff8dea146539fa731cc5746fc5a59e186 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Sun, 17 Mar 2019 21:46:37 +0100
Subject: rootless: fix pod top

we need to join the namespace of the target pod.

Closes: https://github.com/containers/libpod/issues/2682

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 cmd/podman/pod_top.go | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'cmd/podman/pod_top.go')

diff --git a/cmd/podman/pod_top.go b/cmd/podman/pod_top.go
index c9a6d8822..f65d66df6 100644
--- a/cmd/podman/pod_top.go
+++ b/cmd/podman/pod_top.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -53,6 +54,10 @@ func podTopCmd(c *cliconfig.PodTopValues) error {
 	)
 	args := c.InputArgs
 
+	if os.Geteuid() != 0 {
+		rootless.SetSkipStorageSetup(true)
+	}
+
 	if c.ListDescriptors {
 		descriptors, err := libpod.GetContainerPidInformationDescriptors()
 		if err != nil {
@@ -77,6 +82,27 @@ func podTopCmd(c *cliconfig.PodTopValues) error {
 	} else {
 		descriptors = args[1:]
 	}
+
+	if os.Geteuid() != 0 {
+		var pod *adapter.Pod
+		var err error
+		if c.Latest {
+			pod, err = runtime.GetLatestPod()
+		} else {
+			pod, err = runtime.LookupPod(c.InputArgs[0])
+		}
+		if err != nil {
+			return errors.Wrapf(err, "unable to lookup requested container")
+		}
+		became, ret, err := runtime.JoinOrCreateRootlessPod(pod)
+		if err != nil {
+			return err
+		}
+		if became {
+			os.Exit(ret)
+		}
+	}
+
 	w := tabwriter.NewWriter(os.Stdout, 5, 1, 3, ' ', 0)
 	psOutput, err := runtime.PodTop(c, descriptors)
 	if err != nil {
-- 
cgit v1.2.3-54-g00ecf