diff --git a/pkg/server/container_stats_list_unix.go b/pkg/server/container_stats_list_unix.go index b1a2c5045..b5cc732cc 100644 --- a/pkg/server/container_stats_list_unix.go +++ b/pkg/server/container_stats_list_unix.go @@ -19,8 +19,8 @@ limitations under the License. package server import ( - "github.com/containerd/cgroups" "github.com/containerd/containerd/api/types" + v1 "github.com/containerd/containerd/metrics/types/v1" "github.com/containerd/typeurl" "github.com/pkg/errors" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" @@ -61,7 +61,7 @@ func (c *criService) containerMetrics( if err != nil { return nil, errors.Wrap(err, "failed to extract container metrics") } - metrics := s.(*cgroups.Metrics) + metrics := s.(*v1.Metrics) if metrics.CPU != nil && metrics.CPU.Usage != nil { cs.Cpu = &runtime.CpuUsage{ Timestamp: stats.Timestamp.UnixNano(), @@ -84,7 +84,7 @@ func (c *criService) containerMetrics( // getWorkingSet calculates workingset memory from cgroup memory stats. // The caller should make sure memory is not nil. // workingset = usage - total_inactive_file -func getWorkingSet(memory *cgroups.MemoryStat) uint64 { +func getWorkingSet(memory *v1.MemoryStat) uint64 { if memory.Usage == nil { return 0 } diff --git a/vendor/github.com/containerd/cgroups/go.mod b/vendor/github.com/containerd/cgroups/go.mod deleted file mode 100644 index 06d139e9e..000000000 --- a/vendor/github.com/containerd/cgroups/go.mod +++ /dev/null @@ -1,13 +0,0 @@ -module github.com/containerd/cgroups - -go 1.12 - -require ( - github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e - github.com/docker/go-units v0.4.0 - github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e - github.com/gogo/protobuf v1.2.1 - github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700 - github.com/pkg/errors v0.8.1 - golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f -)