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.

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

ROX-18838: Remove docker socket mountpoint from collector container. #1277

Merged
merged 4 commits into from
Aug 14, 2023
Merged

ROX-18838: Remove docker socket mountpoint from collector container. #1277

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b96d3b
Remove docker socket mountpoint from collector container.
ovalenti Aug 8, 2023
be439d6
Restore Runtime.Socket, which is still needed in other places.
ovalenti Aug 9, 2023
1fd0f90
Restore the podman socket to get the runtime parsing work when using …
ovalenti Aug 14, 2023
ddcde20
Podman wants mounts to exist on the host.
ovalenti Aug 14, 2023
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
18 changes: 9 additions & 9 deletions integration-tests/suites/common/collector_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ type CollectorManager struct {

func NewCollectorManager(e Executor, name string) *CollectorManager {
collectorOptions := config.CollectorInfo()
runtimeOptions := config.RuntimeInfo()
image_store := config.Images()

collectionMethod := config.CollectionMethod()
Expand All @@ -51,14 +50,15 @@ func NewCollectorManager(e Executor, name string) *CollectorManager {
env["MODULE_DOWNLOAD_BASE_URL"] = "https://collector-modules.stackrox.io/612dd2ee06b660e728292de9393e18c81a88f347ec52a39207c5166b5302b656"
}
mounts := map[string]string{
"/host/var/run/docker.sock:ro": runtimeOptions.Socket,
"/run/podman/podman.sock:ro": runtimeOptions.Socket,
"/host/proc:ro": "/proc",
"/host/etc:ro": "/etc/",
"/host/usr/lib:ro": "/usr/lib/",
"/host/sys:ro": "/sys/",
"/host/dev:ro": "/dev",
"/tmp": "/tmp",
// The presence of this file disables an optimisation, which turns off podman runtime parsing.
// https://github.com/falcosecurity/libs/pull/296
"/run/podman/podman.sock:ro": "/tmp/dummy_podman_socket_mount",
"/host/proc:ro": "/proc",
"/host/etc:ro": "/etc/",
"/host/usr/lib:ro": "/usr/lib/",
"/host/sys:ro": "/sys/",
"/host/dev:ro": "/dev",
"/tmp": "/tmp",
// /module is an anonymous volume to reflect the way collector
// is usually run in kubernetes (with in-memory volume for /module)
"/module": "",
Expand Down