Skip to content

bump cilium to v1.20.0 #364

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
vishnukumarkvs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bump cilium to v1.20.0 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fcd3b2
bump cilium to v1.20
vishnukumarkvs Aug 12, 2026
2cfa03c
migrate containerd cgroup to v3/cgroup
vishnukumarkvs Aug 12, 2026
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
20 changes: 7 additions & 13 deletions containers/cilium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cilium/cilium/pkg/bpf"
"github.com/cilium/cilium/pkg/defaults"
"github.com/cilium/cilium/pkg/loadbalancer"
lbmap "github.com/cilium/cilium/pkg/loadbalancer/maps"
"github.com/cilium/cilium/pkg/maps/ctmap"
"github.com/cilium/cilium/pkg/maps/lbmap"
"github.com/cilium/cilium/pkg/tuple"
"github.com/cilium/cilium/pkg/u8proto"
"github.com/coroot/coroot-node-agent/proc"
Expand All @@ -28,9 +28,7 @@ type ciliumMapDefinition struct {
}

var ciliumMaps = map[string]ciliumMapDefinition{
lbmap.Backend4MapV2Name: {key: &lbmap.Backend4KeyV3{}, value: &lbmap.Backend4Value{}},
lbmap.Backend4MapV3Name: {key: &lbmap.Backend4KeyV3{}, value: &lbmap.Backend4ValueV3{}},
lbmap.Backend6MapV2Name: {key: &lbmap.Backend6KeyV3{}, value: &lbmap.Backend6Value{}},
lbmap.Backend6MapV3Name: {key: &lbmap.Backend6KeyV3{}, value: &lbmap.Backend6ValueV3{}},
}

Expand All @@ -57,7 +55,7 @@ func init() {
} else {
klog.Infoln("found cilium ebpf-map:", ctmap.MapNameTCP6Global)
}
for _, n := range []string{lbmap.Backend4MapV2Name, lbmap.Backend4MapV3Name} {
for _, n := range []string{lbmap.Backend4MapV3Name} {
def := ciliumMaps[n]
backends4Map, err = bpf.OpenMap(proc.HostPath(filepath.Join(defaults.BPFFSRoot, defaults.TCGlobalsPath, n)), def.key, def.value)
if err != nil {
Expand All @@ -67,7 +65,7 @@ func init() {
break
}
}
for _, n := range []string{lbmap.Backend6MapV2Name, lbmap.Backend6MapV3Name} {
for _, n := range []string{lbmap.Backend6MapV3Name} {
def := ciliumMaps[n]
backends6Map, err = bpf.OpenMap(proc.HostPath(filepath.Join(defaults.BPFFSRoot, defaults.TCGlobalsPath, n)), def.key, def.value)
if err != nil {
Expand Down Expand Up @@ -112,21 +110,19 @@ func lookupCilium4(src, dst netaddr.IPPort) *netaddr.IPPort {
}
e := v.(*ctmap.CtEntry)

backendKey := lbmap.NewBackend4KeyV3(loadbalancer.BackendID(e.BackendID))
backendKey := lbmap.NewBackend4KeyV3(loadbalancer.BackendID(e.Union0[1]))
b, err := backends4Map.Lookup(backendKey)
if err != nil || b == nil {
return nil
}
var backend lbmap.BackendValue
switch bv := b.(type) {
case *lbmap.Backend4Value:
backend = bv.ToHost()
case *lbmap.Backend4ValueV3:
backend = bv.ToHost()
default:
return nil
}
backendIP, _ := netaddr.FromStdIP(backend.GetAddress())
backendIP, _ := netaddr.FromStdIP(backend.GetAddress().AsNetIP())
res := netaddr.IPPortFrom(backendIP, backend.GetPort())
return &res
}
Expand All @@ -152,21 +148,19 @@ func lookupCilium6(src, dst netaddr.IPPort) *netaddr.IPPort {
return nil
}
e := v.(*ctmap.CtEntry)
backendKey := lbmap.NewBackend6KeyV3(loadbalancer.BackendID(e.BackendID))
backendKey := lbmap.NewBackend6KeyV3(loadbalancer.BackendID(e.Union0[1]))
b, err := backends6Map.Lookup(backendKey)
if err != nil || b == nil {
return nil
}
var backend lbmap.BackendValue
switch bv := b.(type) {
case *lbmap.Backend6Value:
backend = bv.ToHost()
case *lbmap.Backend6ValueV3:
backend = bv.ToHost()
default:
return nil
}
backendIP, _ := netaddr.FromStdIP(backend.GetAddress())
backendIP, _ := netaddr.FromStdIP(backend.GetAddress().AsNetIP())
res := netaddr.IPPortFrom(backendIP, backend.GetPort())
return &res
}
11 changes: 6 additions & 5 deletions ebpftracer/tracer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ import (

"github.com/coroot/coroot-node-agent/common"

"github.com/containerd/cgroups"
cgroupsV2 "github.com/containerd/cgroups/v2"
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
"github.com/containerd/cgroups/v3/cgroup2"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -82,14 +83,14 @@ func TestProcessEvents(t *testing.T) {
require.NoError(t, p3.Start())
switch cgroups.Mode() {
case cgroups.Legacy, cgroups.Hybrid:
control, err := cgroups.New(cgroups.V1, cgroups.StaticPath("/program"), &specs.LinuxResources{
control, err := cgroup1.New(cgroup1.StaticPath("/program"), &specs.LinuxResources{
Memory: &specs.LinuxMemory{Limit: &limit},
})
require.NoError(t, err)
defer control.Delete()
require.NoError(t, control.Add(cgroups.Process{Pid: p3.Process.Pid}))
require.NoError(t, control.Add(cgroup1.Process{Pid: p3.Process.Pid}))
case cgroups.Unified:
control, err := cgroupsV2.NewManager("/sys/fs/cgroup", "/program", &cgroupsV2.Resources{Memory: &cgroupsV2.Memory{Max: &limit}})
control, err := cgroup2.NewManager("/sys/fs/cgroup", "/program", &cgroup2.Resources{Memory: &cgroup2.Memory{Max: &limit}})
require.NoError(t, err)
defer control.Delete()
require.NoError(t, control.AddProc(uint64(p3.Process.Pid)))
Expand Down
Loading
Loading