summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-01 15:30:06 +0100
committerGitHub <noreply@github.com>2020-12-01 15:30:06 +0100
commite3f0b7db7508f1e1ecfdb23adb53531c89a29b99 (patch)
treec14bd42ae7fe6fd90679455efe932bd37d1f7a24 /libpod
parent1316b2927be632ff717d9f7fd6a1633198c1ccaf (diff)
parentf62a356515e387b0bbcf1f08b4831d139c2039b7 (diff)
downloadpodman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.gz
podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.bz2
podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.zip
Merge pull request #8400 from rhatdan/varlink
Remove varlink support from podman
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_top_linux.go4
-rw-r--r--libpod/events/config.go4
-rw-r--r--libpod/pod_top_linux.go5
3 files changed, 4 insertions, 9 deletions
diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go
index d6d4c6084..161367d75 100644
--- a/libpod/container_top_linux.go
+++ b/libpod/container_top_linux.go
@@ -80,8 +80,8 @@ func (c *Container) Top(descriptors []string) ([]string, error) {
func (c *Container) GetContainerPidInformation(descriptors []string) ([]string, error) {
pid := strconv.Itoa(c.state.PID)
// TODO: psgo returns a [][]string to give users the ability to apply
- // filters on the data. We need to change the API here and the
- // varlink API to return a [][]string if we want to make use of
+ // filters on the data. We need to change the API here
+ // to return a [][]string if we want to make use of
// filtering.
opts := psgo.JoinNamespaceOpts{FillMappings: rootless.IsRootless()}
diff --git a/libpod/events/config.go b/libpod/events/config.go
index af09a65ae..fc1457289 100644
--- a/libpod/events/config.go
+++ b/libpod/events/config.go
@@ -95,10 +95,6 @@ type Type string
type Status string
const (
- // If you add or subtract any values to the following lists, make sure you also update
- // the switch statements below and the enums for EventType or EventStatus in the
- // varlink description file.
-
// Container - event is related to containers
Container Type = "container"
// Image - event is related to images
diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go
index 15ba02389..0e42c62df 100644
--- a/libpod/pod_top_linux.go
+++ b/libpod/pod_top_linux.go
@@ -53,9 +53,8 @@ func (p *Pod) GetPodPidInformation(descriptors []string) ([]string, error) {
}
// TODO: psgo returns a [][]string to give users the ability to apply
- // filters on the data. We need to change the API here and the
- // varlink API to return a [][]string if we want to make use of
- // filtering.
+ // filters on the data. We need to change the API here to return
+ // a [][]string if we want to make use of filtering.
opts := psgo.JoinNamespaceOpts{FillMappings: rootless.IsRootless()}
output, err := psgo.JoinNamespaceAndProcessInfoByPidsWithOptions(pids, psgoDescriptors, &opts)
if err != nil {