diff --git a/test/e2e/framework/kubelet_stats.go b/test/e2e/framework/kubelet_stats.go index d3a25a405c5..8a61d204087 100644 --- a/test/e2e/framework/kubelet_stats.go +++ b/test/e2e/framework/kubelet_stats.go @@ -369,10 +369,8 @@ func getOneTimeResourceUsageOnNode( } f := func(name string, newStats *stats.ContainerStats) *ContainerResourceUsage { - // TODO(gmarek): remove when #46198 is debugged. - if newStats == nil || newStats.CPU == nil { - glog.Warning("NewStats is %#v for container %v", newStats, name) - return &ContainerResourceUsage{} + if newStats == nil || newStats.CPU == nil || newStats.Memory == nil { + return nil } return &ContainerResourceUsage{ Name: name, @@ -401,7 +399,9 @@ func getOneTimeResourceUsageOnNode( if !isInteresting { continue } - usageMap[pod.PodRef.Name+"/"+container.Name] = f(pod.PodRef.Name+"/"+container.Name, &container) + if usage := f(pod.PodRef.Name+"/"+container.Name, &container); usage != nil { + usageMap[pod.PodRef.Name+"/"+container.Name] = usage + } } } return usageMap, nil