Skip to content

Expand running_in_container? check to handle Kubernetes, probably #5

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expand running_in_container? check to handle Kubernetes, probably #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/berkeley_library/docker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def running_in_container?

def init_cgroup_is_dockerish?
begin
File.open('/proc/1/cgroup').read.match?(%r{(/docker|/lxc)})
File.open('/proc/1/cgroup').read.match?(%r{(/docker|/lxc|/kubepods)})
rescue
false
end
Expand Down
36 changes: 31 additions & 5 deletions spec/berkeley_library/docker_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@ module BerkeleyLibrary
1:name=systemd:/docker/12345
EOL

KUBEISH_CGROUP = <<~EOL
11:perf_event:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
10:hugetlb:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
9:devices:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
8:net_cls,net_prio:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
7:blkio:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
6:cpu,cpuacct:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
5:pids:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
4:cpuset:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
3:freezer:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
2:memory:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
1:name=systemd:/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod9a_bc_de_f0_12.slice/cri-containerd-12345.scope
EOL

TRADITIONAL_CGROUP = <<~EOL
11:cpuacct,cpu:/
10:devices:/
Expand All @@ -33,20 +47,32 @@ module BerkeleyLibrary
1:name=systemd:/
EOL

CGROUPS = {
trad: TRADITIONAL_CGROUP,
kube: KUBEISH_CGROUP,
docker: DOCKERISH_CGROUP
}

it 'is true when /.dockerenv exists' do
mock_dockerenv
expect(BerkeleyLibrary::Docker.running_in_container?).to be true
end

it 'is true when /proc/1/cgroup is docker-like' do
mock_dockerenv(false)
mock_init_cgroup
mock_init_cgroup(:docker)
expect(BerkeleyLibrary::Docker.running_in_container?).to be true
end

it 'is true when /proc/1/cgroup is kube-like' do
mock_dockerenv(false)
mock_init_cgroup(:kube)
expect(BerkeleyLibrary::Docker.running_in_container?).to be true
end

it 'is false when /proc/1/cgroup is traditional' do
mock_dockerenv(false)
mock_init_cgroup(false)
mock_init_cgroup(:trad)
expect(BerkeleyLibrary::Docker.running_in_container?).to be false
end

Expand All @@ -66,11 +92,11 @@ def mock_dockerenv(exists = true)
.and_return(exists)
end

def mock_init_cgroup(dockerish = true)
def mock_init_cgroup(type)
cgroup_data = CGROUPS.fetch(type)
expect(File)
.to receive(:open).with('/proc/1/cgroup')
.and_return(
StringIO.new(dockerish ? DOCKERISH_CGROUP : TRADITIONAL_CGROUP))
.and_return(StringIO.new(cgroup_data))
end
end
end
Expand Down