Skip to content

Commit 27552ce

Browse files
thaJeztahthaJeztah
committed
bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
full diff: containerd/cgroups@c4b9ac5...5fbad35 - containerd/cgroups#82 Add go module support - containerd/cgroups#96 Move metrics proto package to stats/v1 - containerd/cgroups#97 Allow overriding the default /proc folder in blkioController - containerd/cgroups#98 Allows ignoring memory modules - containerd/cgroups#99 Add Go 1.13 to Travis - containerd/cgroups#100 stats/v1: export per-cgroup stats Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 7cb4661 commit 27552ce

17 files changed

Lines changed: 1543 additions & 423 deletions

File tree

‎daemon/daemon_unix.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"strings"
1717
"time"
1818

19-
containerd_cgroups "github.com/containerd/cgroups"
19+
v1 "github.com/containerd/cgroups/stats/v1"
2020
"github.com/docker/docker/api/types"
2121
"github.com/docker/docker/api/types/blkiodev"
2222
pblkiodev "github.com/docker/docker/api/types/blkiodev"
@@ -1376,7 +1376,7 @@ func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container
13761376
return daemon.Unmount(container)
13771377
}
13781378

1379-
func copyBlkioEntry(entries []*containerd_cgroups.BlkIOEntry) []types.BlkioStatEntry {
1379+
func copyBlkioEntry(entries []*v1.BlkIOEntry) []types.BlkioStatEntry {
13801380
out := make([]types.BlkioStatEntry, len(entries))
13811381
for i, re := range entries {
13821382
out[i] = types.BlkioStatEntry{

‎libcontainerd/types/types_linux.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package types // import "github.com/docker/docker/libcontainerd/types"
33
import (
44
"time"
55

6-
"github.com/containerd/cgroups"
6+
v1 "github.com/containerd/cgroups/stats/v1"
77
specs "github.com/opencontainers/runtime-spec/specs-go"
88
)
99

@@ -13,13 +13,13 @@ type Summary struct{}
1313
// Stats holds metrics properties as returned by containerd
1414
type Stats struct {
1515
Read time.Time
16-
Metrics *cgroups.Metrics
16+
Metrics *v1.Metrics
1717
}
1818

1919
// InterfaceToStats returns a stats object from the platform-specific interface.
2020
func InterfaceToStats(read time.Time, v interface{}) *Stats {
2121
return &Stats{
22-
Metrics: v.(*cgroups.Metrics),
22+
Metrics: v.(*v1.Metrics),
2323
Read: read,
2424
}
2525
}

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ google.golang.org/genproto 694d95ba50e67b2e363f3483057d
120120
github.com/containerd/containerd 36cf5b690dcc00ff0f34ff7799209050c3d0c59a # v1.3.0
121121
github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
122122
github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
123-
github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
123+
github.com/containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
124124
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
125125
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
126126
github.com/containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d

‎vendor/github.com/containerd/cgroups/blkio.go‎

Lines changed: 26 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cgroups/cgroup.go‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cgroups/control.go‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cgroups/cpu.go‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cgroups/cpuacct.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cgroups/go.mod‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cgroups/hugetlb.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)