bugfix: only list container stats which are created by cri

Signed-off-by: YaoZengzeng <[email protected]>
AliyunContainerService · Sep 25, 2018 · aac0a06 · aac0a06
1 parent 7addef1
commit aac0a06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cri/v1alpha1/cri.go b/cri/v1alpha1/cri.go
@@ -822,7 +822,7 @@ func (c *CriManager) ContainerStats(ctx context.Context, r *runtime.ContainerSta
 func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListContainerStatsRequest) (*runtime.ListContainerStatsResponse, error) {
 	opts := &mgr.ContainerListOption{All: true}
 	filter := func(c *mgr.Container) bool {
-		return true
+		return c.Config.Labels[containerTypeLabelKey] == containerTypeLabelContainer
 	}
 	opts.FilterFunc = filter
 

diff --git a/cri/v1alpha2/cri.go b/cri/v1alpha2/cri.go
@@ -918,7 +918,7 @@ func (c *CriManager) ContainerStats(ctx context.Context, r *runtime.ContainerSta
 func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListContainerStatsRequest) (*runtime.ListContainerStatsResponse, error) {
 	opts := &mgr.ContainerListOption{All: true}
 	filter := func(c *mgr.Container) bool {
-		return true
+		return c.Config.Labels[containerTypeLabelKey] == containerTypeLabelContainer
 	}
 	opts.FilterFunc = filter