diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-11 05:39:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 05:39:12 -0800 |
| commit | b3eb23d671425775673f86bd02b9c89ef781f590 (patch) | |
| tree | 5f06e4e289f16d9164d692590a3fe6541b5384cf /vendor/github.com/vishvananda/netns/netns_linux.go | |
| parent | 26f2b7debde313af4a5ae39727c66a3f8fd59be4 (diff) | |
| parent | bd40dcfc2bc7c9014ea1f33482fb63aacbcdfe87 (diff) | |
| download | podman-b3eb23d671425775673f86bd02b9c89ef781f590.tar.gz podman-b3eb23d671425775673f86bd02b9c89ef781f590.tar.bz2 podman-b3eb23d671425775673f86bd02b9c89ef781f590.zip | |
Merge pull request #2102 from vrothberg/vendor-update
vendor: update everything
Diffstat (limited to 'vendor/github.com/vishvananda/netns/netns_linux.go')
| -rw-r--r-- | vendor/github.com/vishvananda/netns/netns_linux.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vendor/github.com/vishvananda/netns/netns_linux.go b/vendor/github.com/vishvananda/netns/netns_linux.go index a267c7105..e665ef449 100644 --- a/vendor/github.com/vishvananda/netns/netns_linux.go +++ b/vendor/github.com/vishvananda/netns/netns_linux.go @@ -188,6 +188,12 @@ func getPidForContainer(id string) (int, error) { filepath.Join(cgroupRoot, "system.slice", "docker-"+id+".scope", "tasks"), // Even more recent docker versions under cgroup/systemd/docker/<id>/ filepath.Join(cgroupRoot, "..", "systemd", "docker", id, "tasks"), + // Kubernetes with docker and CNI is even more different + filepath.Join(cgroupRoot, "..", "systemd", "kubepods", "*", "pod*", id, "tasks"), + // Another flavor of containers location in recent kubernetes 1.11+ + filepath.Join(cgroupRoot, cgroupThis, "kubepods.slice", "kubepods-besteffort.slice", "*", "docker-"+id+".scope", "tasks"), + // When runs inside of a container with recent kubernetes 1.11+ + filepath.Join(cgroupRoot, "kubepods.slice", "kubepods-besteffort.slice", "*", "docker-"+id+".scope", "tasks"), } var filename string |