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 <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2019-09-25 16:43:05 -04:00
parent 1009023783
commit 8ff5827e98
85 changed files with 8617 additions and 2124 deletions

View File

@@ -25,7 +25,7 @@ import (
"os"
"text/tabwriter"
"github.com/containerd/cgroups"
v1 "github.com/containerd/cgroups/stats/v1"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/typeurl"
"github.com/urfave/cli"
@@ -77,7 +77,7 @@ var metricsCommand = cli.Command{
if err != nil {
return err
}
data, ok := anydata.(*cgroups.Metrics)
data, ok := anydata.(*v1.Metrics)
if !ok {
return errors.New("cannot convert metric data to cgroups.Metrics")
}