Skip to content

Commit 8ff5827

Browse files
crosbymichaelcrosbymichael
committed
Update cri and cgroup packages
This change includes a cri master bump and a cgroup bump for windows support with cgroup stats and reusing the cgroup metric types. Signed-off-by: Michael Crosby <[email protected]>
1 parent 1009023 commit 8ff5827

85 files changed

Lines changed: 8617 additions & 2124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/ctr/commands/tasks/metrics.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"os"
2626
"text/tabwriter"
2727

28-
"github.com/containerd/cgroups"
28+
v1 "github.com/containerd/cgroups/stats/v1"
2929
"github.com/containerd/containerd/cmd/ctr/commands"
3030
"github.com/containerd/typeurl"
3131
"github.com/urfave/cli"
@@ -77,7 +77,7 @@ var metricsCommand = cli.Command{
7777
if err != nil {
7878
return err
7979
}
80-
data, ok := anydata.(*cgroups.Metrics)
80+
data, ok := anydata.(*v1.Metrics)
8181
if !ok {
8282
return errors.New("cannot convert metric data to cgroups.Metrics")
8383
}

‎metrics/types/v1/types.go‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,29 @@
1818

1919
package v1
2020

21-
import "github.com/containerd/cgroups"
21+
import (
22+
v1 "github.com/containerd/cgroups/stats/v1"
23+
)
2224

2325
type (
2426
// Metrics alias
25-
Metrics = cgroups.Metrics
27+
Metrics = v1.Metrics
2628
// BlkIOEntry alias
27-
BlkIOEntry = cgroups.BlkIOEntry
29+
BlkIOEntry = v1.BlkIOEntry
2830
// MemoryStat alias
29-
MemoryStat = cgroups.MemoryStat
31+
MemoryStat = v1.MemoryStat
3032
// CPUStat alias
31-
CPUStat = cgroups.CPUStat
33+
CPUStat = v1.CPUStat
3234
// CPUUsage alias
33-
CPUUsage = cgroups.CPUUsage
35+
CPUUsage = v1.CPUUsage
3436
// BlkIOStat alias
35-
BlkIOStat = cgroups.BlkIOStat
37+
BlkIOStat = v1.BlkIOStat
3638
// PidsStat alias
37-
PidsStat = cgroups.PidsStat
39+
PidsStat = v1.PidsStat
3840
// RdmaStat alias
39-
RdmaStat = cgroups.RdmaStat
41+
RdmaStat = v1.RdmaStat
4042
// RdmaEntry alias
41-
RdmaEntry = cgroups.RdmaEntry
43+
RdmaEntry = v1.RdmaEntry
4244
// HugetlbStat alias
43-
HugetlbStat = cgroups.HugetlbStat
45+
HugetlbStat = v1.HugetlbStat
4446
)

‎vendor.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
22
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
3-
github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
3+
github.com/containerd/cgroups abd0b19954a6b05e0963f48427062d1481b7faad
44
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
55
github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
66
github.com/containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877
@@ -51,8 +51,8 @@ github.com/cpuguy83/go-md2man v1.0.10
5151
github.com/russross/blackfriday v1.5.2
5252

5353
# cri dependencies
54-
github.com/containerd/cri 5d49e7e51b43e36a6b9c4386257c7d08c602237f # release/1.3
55-
github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1
54+
github.com/containerd/cri 0ebf032aac5f6029f95a94e42161e9db7a7e84df # release/1.3+
55+
github.com/containerd/go-cni 0d360c50b10b350b6bb23863fd4dfb1c232b01c9
5656
github.com/containernetworking/cni v0.7.1
5757
github.com/containernetworking/plugins v0.7.6
5858
github.com/davecgh/go-spew v1.1.1

‎vendor/github.com/Microsoft/hcsshim/hcn/hcn.go‎

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

0 commit comments

Comments
 (0)