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

Jump to bottom

vendor: github.com/containerd/cgroups/v3 v3.0.1 #44886

Merged
merged 1 commit into from Mar 8, 2023
Merged

vendor: github.com/containerd/cgroups/v3 v3.0.1 #44886

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/dockerd/daemon_linux.go
View file
Open in desktop
@@ -1,7 +1,7 @@
package main

import (
cdcgroups "github.com/containerd/cgroups"
cdcgroups "github.com/containerd/cgroups/v3"
systemdDaemon "github.com/coreos/go-systemd/v22/daemon"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/pkg/sysinfo"
Expand Down
2 changes: 1 addition & 1 deletion daemon/config/config_linux.go
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
"path/filepath"

"github.com/containerd/cgroups"
"github.com/containerd/cgroups/v3"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/opts"
Expand Down
6 changes: 3 additions & 3 deletions daemon/daemon_unix.go
View file
Open in desktop
Expand Up @@ -18,9 +18,9 @@ import (
"syscall"
"time"

"github.com/containerd/cgroups"
statsV1 "github.com/containerd/cgroups/stats/v1"
statsV2 "github.com/containerd/cgroups/v2/stats"
"github.com/containerd/cgroups/v3"
statsV1 "github.com/containerd/cgroups/v3/cgroup1/stats"
statsV2 "github.com/containerd/cgroups/v3/cgroup2/stats"
"github.com/containerd/containerd/pkg/userns"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/blkiodev"
Expand Down
2 changes: 1 addition & 1 deletion daemon/oci_linux.go
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"
"strings"

cdcgroups "github.com/containerd/cgroups"
cdcgroups "github.com/containerd/cgroups/v3"
"github.com/containerd/containerd/containers"
coci "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/apparmor"
Expand Down
4 changes: 2 additions & 2 deletions libcontainerd/types/types_linux.go
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ type Summary struct{}
type Stats struct {
Read time.Time
// Metrics is expected to be either one of:
// * github.com/containerd/cgroups/stats/v1.Metrics
// * github.com/containerd/cgroups/stats/v2.Metrics
// * github.com/containerd/cgroups/v3/cgroup1/stats.Metrics
// * github.com/containerd/cgroups/v3/cgroup2/stats.Metrics
Metrics interface{}
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/sysinfo/cgroup2_linux.go
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@ import (
"path"
"strings"

"github.com/containerd/cgroups"
cgroupsV2 "github.com/containerd/cgroups/v2"
"github.com/containerd/cgroups/v3"
cgroupsV2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/pkg/userns"
"github.com/sirupsen/logrus"
)
Expand All @@ -27,7 +27,7 @@ func newV2(options ...Opt) *SysInfo {
applyCgroupNsInfo,
}

m, err := cgroupsV2.LoadManager("/sys/fs/cgroup", sysInfo.cg2GroupPath)
m, err := cgroupsV2.Load(sysInfo.cg2GroupPath)
if err != nil {
logrus.Warn(err)
} else {
Expand Down
5 changes: 3 additions & 2 deletions pkg/sysinfo/sysinfo_linux.go
View file
Open in desktop
Expand Up @@ -7,7 +7,8 @@ import (
"strings"
"sync"

"github.com/containerd/cgroups"
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
"github.com/containerd/containerd/pkg/seccomp"
"github.com/moby/sys/mountinfo"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -40,7 +41,7 @@ func findCgroupV1Mountpoints() (map[string]string, error) {
return nil, err
}

allSubsystems, err := cgroups.ParseCgroupFile("/proc/self/cgroup")
allSubsystems, err := cgroup1.ParseCgroupFile("/proc/self/cgroup")
if err != nil {
return nil, fmt.Errorf("Failed to parse cgroup information: %v", err)
}
Expand Down
5 changes: 3 additions & 2 deletions vendor.mod
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ require (
github.com/aws/smithy-go v1.13.1
github.com/bsphere/le_go v0.0.0-20200109081728-fc06dab2caa8
github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5
github.com/containerd/cgroups v1.0.4
github.com/containerd/cgroups/v3 v3.0.1
github.com/containerd/containerd v1.6.19
github.com/containerd/continuity v0.3.0
github.com/containerd/fifo v1.1.0
Expand Down Expand Up @@ -113,8 +113,9 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cilium/ebpf v0.7.0 // indirect
github.com/cilium/ebpf v0.9.1 // indirect
github.com/container-storage-interface/spec v1.5.0 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess most of these will go away if we update containerd vendor to 1.7 (I need to update my PR #44530).

Was giving the hcsshim one a try (microsoft/hcsshim#1618), but didn't get too far.

go mod graph --modfile=vendor.mod | grep ' github.com/containerd/cgroups'

github.com/docker/docker github.com/containerd/cgroups@v1.0.4
github.com/docker/docker github.com/containerd/cgroups/v3@v3.0.1
github.com/Microsoft/hcsshim@v0.9.7 github.com/containerd/cgroups@v1.0.1
github.com/containerd/containerd@v1.6.19 github.com/containerd/cgroups@v1.0.4
github.com/containerd/nydus-snapshotter@v0.3.1 github.com/containerd/cgroups@v1.0.3
github.com/moby/buildkit@v0.11.4 github.com/containerd/cgroups@v1.0.4
github.com/containerd/containerd@v1.5.7 github.com/containerd/cgroups@v1.0.1
github.com/Microsoft/hcsshim@v0.8.21 github.com/containerd/cgroups@v1.0.1
github.com/containerd/containerd@v1.5.0-beta.3 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/Microsoft/hcsshim@v0.8.10 github.com/containerd/cgroups@v0.0.0-20200531161412-0dbf7f05ba59
github.com/containerd/stargz-snapshotter@v0.0.0-20201027054423-3a04e4c2c116 github.com/containerd/cgroups@v0.0.0-20200710171044-318312a37340
github.com/containerd/containerd@v1.5.1 github.com/containerd/cgroups@v1.0.1
github.com/Microsoft/hcsshim@v0.8.16 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/containerd/containerd@v1.5.0-rc.0 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/Microsoft/hcsshim@v0.8.15 github.com/containerd/cgroups@v0.0.0-20200824123100-0b889c03f102
github.com/containerd/nri@v0.0.0-20201007170849-eb1350a75164 github.com/containerd/cgroups@v0.0.0-20200710171044-318312a37340
github.com/Microsoft/hcsshim@v0.8.9 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f
github.com/containerd/containerd@v1.5.0-beta.4 github.com/containerd/cgroups@v0.0.0-20210114181951-8a68de567b68
github.com/containerd/containerd@v1.5.0-beta.1 github.com/containerd/cgroups@v0.0.0-20200824123100-0b889c03f102
github.com/Microsoft/hcsshim@v0.8.14 github.com/containerd/cgroups@v0.0.0-20200531161412-0dbf7f05ba59
github.com/Microsoft/hcsshim@v0.8.7 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f
github.com/containerd/imgcrypt@v1.0.1 github.com/containerd/cgroups@v0.0.0-20190717030353-c4b9ac5c7601

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With containerd 1.7.0-rc.2, it looks like;

go mod graph --modfile=vendor.mod | grep ' github.com/containerd/cgroups@'
github.com/docker/docker github.com/containerd/cgroups@v1.1.0
github.com/Microsoft/hcsshim@v0.10.0-rc.7 github.com/containerd/cgroups@v1.1.0
github.com/containerd/containerd@v1.7.0-rc.2 github.com/containerd/cgroups@v1.1.0
github.com/containerd/nydus-snapshotter@v0.3.1 github.com/containerd/cgroups@v1.0.3
github.com/moby/buildkit@v0.11.4 github.com/containerd/cgroups@v1.0.4
github.com/Microsoft/hcsshim@v0.8.10 github.com/containerd/cgroups@v0.0.0-20200531161412-0dbf7f05ba59
github.com/containerd/stargz-snapshotter@v0.0.0-20201027054423-3a04e4c2c116 github.com/containerd/cgroups@v0.0.0-20200710171044-318312a37340
github.com/Microsoft/hcsshim@v0.8.9 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f
github.com/Microsoft/hcsshim@v0.8.7 github.com/containerd/cgroups@v0.0.0-20190919134610-bf292b21730f

github.com/containerd/console v1.0.3 // indirect
github.com/containerd/go-cni v1.1.6 // indirect
github.com/containerd/go-runc v1.0.0 // indirect
Expand Down
10 changes: 7 additions & 3 deletions vendor.sum
View file
Open in desktop
Expand Up @@ -302,8 +302,9 @@ github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLI
github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
github.com/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4=
github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
Expand Down Expand Up @@ -345,6 +346,8 @@ github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTF
github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA=
github.com/containerd/cgroups/v3 v3.0.1 h1:4hfGvu8rfGIwVIDd+nLzn/B9ZXx4BcCjzt5ToenJRaE=
github.com/containerd/cgroups/v3 v3.0.1/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw=
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
Expand Down Expand Up @@ -562,8 +565,8 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
Expand Down Expand Up @@ -962,8 +965,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
Expand Down Expand Up @@ -1257,6 +1260,7 @@ github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rootless-containers/rootlesskit v1.1.0 h1:cRaRIYxY8oce4eE/zeAUZhgKu/4tU1p9YHN4+suwV7M=
github.com/rootless-containers/rootlesskit v1.1.0/go.mod h1:H+o9ndNe7tS91WqU0/+vpvc+VaCd7TCIWaJjnV0ujUo=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
Expand Down
6 changes: 6 additions & 0 deletions vendor/github.com/cilium/ebpf/ARCHITECTURE.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/github.com/cilium/ebpf/MAINTAINERS.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 60 additions & 23 deletions vendor/github.com/cilium/ebpf/Makefile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions vendor/github.com/cilium/ebpf/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions vendor/github.com/cilium/ebpf/asm/func.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.