Merge pull request #1287 from crosbymichael/cgroups

Use type alias from containerd for cgroup metric types

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
 	}