From 37ce6e19b963f10dc4cd60dfac60aca66b34b7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?And=C5=BEej=20Maciusovi=C4=8D?= Date: Wed, 6 Nov 2024 15:22:49 +0200 Subject: [PATCH] Add missing runtime capability (#393) --- charts/kvisor/values.yaml | 1 + cmd/agent/daemon/app/app.go | 4 +++- pkg/kernel/version.go | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/kvisor/values.yaml b/charts/kvisor/values.yaml index 685692f3..4f1fa7b7 100644 --- a/charts/kvisor/values.yaml +++ b/charts/kvisor/values.yaml @@ -76,6 +76,7 @@ agent: - NET_ADMIN - BPF - PERFMON + - IPC_LOCK # Needed for mmap. drop: - ALL seccompProfile: diff --git a/cmd/agent/daemon/app/app.go b/cmd/agent/daemon/app/app.go index 959dd095..ea2a6d4c 100644 --- a/cmd/agent/daemon/app/app.go +++ b/cmd/agent/daemon/app/app.go @@ -27,6 +27,7 @@ import ( "github.com/castai/kvisor/pkg/ebpftracer/events" "github.com/castai/kvisor/pkg/ebpftracer/signature" "github.com/castai/kvisor/pkg/ebpftracer/types" + "github.com/castai/kvisor/pkg/kernel" "github.com/castai/kvisor/pkg/logging" "github.com/castai/kvisor/pkg/proc" "github.com/castai/kvisor/pkg/processtree" @@ -207,7 +208,8 @@ func (a *App) Run(ctx context.Context) error { return errors.New("no configured exporters") } - log.Infof("running kvisor agent, version=%s", a.cfg.Version) + kernelVersion, _ := kernel.CurrentKernelVersion() + log.Infof("running kvisor agent, version=%s, kernel_version=%s", a.cfg.Version, kernelVersion) defer log.Infof("stopping kvisor agent, version=%s", a.cfg.Version) if addr := a.cfg.PyroscopeAddr; addr != "" { diff --git a/pkg/kernel/version.go b/pkg/kernel/version.go index 0b611722..e988267e 100644 --- a/pkg/kernel/version.go +++ b/pkg/kernel/version.go @@ -30,6 +30,10 @@ type Version struct { VersionCode int } +func (v Version) String() string { + return fmt.Sprintf("%d.%d.%d", v.Major, v.Minor, v.Patch) +} + // KernelVersionFromReleaseString converts a release string with format // 4.4.2[-1] to a kernel version number in LINUX_VERSION_CODE format. // That is, for kernel "a.b.c", the version number will be (a<<16 + b<<8 + c)