Skip to content

Integrate gVisor with containerd 1.7.25. #12346

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
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Integrate gVisor with containerd 1.7.25. #12346

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
20 changes: 13 additions & 7 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,10 @@ use_repo(
"com_github_burntsushi_toml",
"com_github_cenkalti_backoff",
"com_github_cilium_ebpf",
"com_github_containerd_cgroups",
"com_github_containerd_cgroups_v3",
"com_github_containerd_console",
"com_github_containerd_containerd",
"com_github_containerd_containerd_api",
"com_github_containerd_errdefs",
"com_github_containerd_fifo",
"com_github_containerd_go_runc",
Expand Down Expand Up @@ -524,13 +525,18 @@ go_deps.module(
)
go_deps.module(
path = "github.com/containerd/containerd",
sum = "h1:Bcj0ZXqgIs6GG+YbaKkMX3Dap0JsIVG4UYFOLRo7iX4=",
version = "v1.6.36",
sum = "h1:khEQOAXOEJalRO228yzVsuASLH42vT7DIo9Ss+9SMFQ=",
version = "v1.7.25",
)
go_deps.module(
path = "github.com/containerd/cgroups",
sum = "h1:iJnMvco9XGvKUvNQkv88bE4uJXxRQH18efbKo9w5vHQ=",
version = "v1.0.1",
path = "github.com/containerd/containerd/api",
sum = "h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=",
version = "v1.8.0",
)
go_deps.module(
path = "github.com/containerd/cgroups/v3",
sum = "h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0=",
version = "v3.0.2",
)
go_deps.module(
path = "github.com/containerd/errdefs",
Expand Down Expand Up @@ -573,7 +579,7 @@ go_deps.gazelle_override(
directives = [
"gazelle:proto disable",
],
path = "github.com/containerd/cgroups",
path = "github.com/containerd/cgroups/v3",
)
go_deps.gazelle_override(
directives = [
Expand Down
9 changes: 5 additions & 4 deletions pkg/shim/v1/runsc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ go_library(
"//pkg/shim/v1/utils",
"//runsc/specutils",
"@com_github_burntsushi_toml//:go_default_library",
"@com_github_containerd_cgroups//:go_default_library",
"@com_github_containerd_cgroups//stats/v1:go_default_library",
"@com_github_containerd_cgroups//v2:go_default_library",
"@com_github_containerd_cgroups//v2/stats:go_default_library",
"@com_github_containerd_cgroups_v3//:go_default_library",
"@com_github_containerd_cgroups_v3//cgroup1:go_default_library",
"@com_github_containerd_cgroups_v3//cgroup1/stats:go_default_library",
"@com_github_containerd_cgroups_v3//cgroup2:go_default_library",
"@com_github_containerd_cgroups_v3//cgroup2/stats:go_default_library",
"@com_github_containerd_console//:go_default_library",
"@com_github_containerd_containerd//api/events:go_default_library",
"@com_github_containerd_containerd//api/types/task:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/shim/v1/runsc/epoll.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"sync"

"github.com/containerd/cgroups"
cgroups "github.com/containerd/cgroups/v3/cgroup1"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/runtime"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion pkg/shim/v1/runsc/oom_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"context"
"fmt"

cgroupsv2 "github.com/containerd/cgroups/v2"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/sirupsen/logrus"
Expand Down
33 changes: 17 additions & 16 deletions pkg/shim/v1/runsc/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/containerd/cgroups"
cgroupsstats "github.com/containerd/cgroups/stats/v1"
cgroupsv2 "github.com/containerd/cgroups/v2"
cgroupsv2stats "github.com/containerd/cgroups/v2/stats"
cgroups "github.com/containerd/cgroups/v3"
cgroupsv1 "github.com/containerd/cgroups/v3/cgroup1"
cgroupsv1stats "github.com/containerd/cgroups/v3/cgroup1/stats"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
cgroupsv2stats "github.com/containerd/cgroups/v3/cgroup2/stats"
"github.com/containerd/console"
"github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
Expand Down Expand Up @@ -380,10 +381,10 @@ func (s *runscService) Create(ctx context.Context, r *taskAPI.CreateTaskRequest)
var cgPath string
cgPath, err = cgroupsv2.PidGroupPath(pid)
if err == nil {
cg, err = cgroupsv2.LoadManager("/sys/fs/cgroup", cgPath)
cg, err = cgroupsv2.Load(cgPath)
}
} else {
cg, err = cgroups.Load(cgroups.V1, cgroups.PidPath(pid))
cg, err = cgroupsv1.Load(cgroupsv1.PidPath(pid))
}
if err != nil {
return nil, fmt.Errorf("loading cgroup for %d: %w", pid, err)
Expand Down Expand Up @@ -674,48 +675,48 @@ func (s *runscService) getStats(stats *runc.Stats, r *taskAPI.StatsRequest) (*ta
}

func (s *runscService) getV1Stats(stats *runc.Stats, r *taskAPI.StatsRequest) (*taskAPI.StatsResponse, error) {
metrics := &cgroupsstats.Metrics{
CPU: &cgroupsstats.CPUStat{
Usage: &cgroupsstats.CPUUsage{
metrics := &cgroupsv1stats.Metrics{
CPU: &cgroupsv1stats.CPUStat{
Usage: &cgroupsv1stats.CPUUsage{
Total: stats.Cpu.Usage.Total,
Kernel: stats.Cpu.Usage.Kernel,
User: stats.Cpu.Usage.User,
PerCPU: stats.Cpu.Usage.Percpu,
},
Throttling: &cgroupsstats.Throttle{
Throttling: &cgroupsv1stats.Throttle{
Periods: stats.Cpu.Throttling.Periods,
ThrottledPeriods: stats.Cpu.Throttling.ThrottledPeriods,
ThrottledTime: stats.Cpu.Throttling.ThrottledTime,
},
},
Memory: &cgroupsstats.MemoryStat{
Memory: &cgroupsv1stats.MemoryStat{
Cache: stats.Memory.Cache,
Usage: &cgroupsstats.MemoryEntry{
Usage: &cgroupsv1stats.MemoryEntry{
Limit: stats.Memory.Usage.Limit,
Usage: stats.Memory.Usage.Usage,
Max: stats.Memory.Usage.Max,
Failcnt: stats.Memory.Usage.Failcnt,
},
Swap: &cgroupsstats.MemoryEntry{
Swap: &cgroupsv1stats.MemoryEntry{
Limit: stats.Memory.Swap.Limit,
Usage: stats.Memory.Swap.Usage,
Max: stats.Memory.Swap.Max,
Failcnt: stats.Memory.Swap.Failcnt,
},
Kernel: &cgroupsstats.MemoryEntry{
Kernel: &cgroupsv1stats.MemoryEntry{
Limit: stats.Memory.Kernel.Limit,
Usage: stats.Memory.Kernel.Usage,
Max: stats.Memory.Kernel.Max,
Failcnt: stats.Memory.Kernel.Failcnt,
},
KernelTCP: &cgroupsstats.MemoryEntry{
KernelTCP: &cgroupsv1stats.MemoryEntry{
Limit: stats.Memory.KernelTCP.Limit,
Usage: stats.Memory.KernelTCP.Usage,
Max: stats.Memory.KernelTCP.Max,
Failcnt: stats.Memory.KernelTCP.Failcnt,
},
},
Pids: &cgroupsstats.PidsStat{
Pids: &cgroupsv1stats.PidsStat{
Current: stats.Pids.Current,
Limit: stats.Pids.Limit,
},
Expand Down
Loading