Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proc: detect kubernetes runtime by mounts #2054

Merged
merged 1 commit into from
Apr 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/util/proc/proc.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"
)

Expand Down Expand Up @@ -140,6 +141,13 @@ func GetContainerRuntime(tgid, pid int) ContainerRuntime {
return runtime
}

// Docker was not detected at this point.
// An overlay mount on "/" may indicate we're under containerd or other runtime.
a = readFileString("/proc/mounts")
if m, _ := regexp.MatchString("^[^ ]+ / overlay", a); m {
return RuntimeKubernetes
}

return RuntimeNotFound
}

Expand All @@ -154,6 +162,8 @@ func detectContainerFiles() ContainerRuntime {
{RuntimePodman, "/run/.containerenv"},
// https://github.com/moby/moby/issues/18355
{RuntimeDocker, "/.dockerenv"},
// Detect the presence of a serviceaccount secret mounted in the default location
{RuntimeKubernetes, "/var/run/secrets/kubernetes.io/serviceaccount"},
}

for i := range files {
Expand Down