diff --git a/pkg/kubelet/server/stats/summary.go b/pkg/kubelet/server/stats/summary.go index 9d2dc030bbd..59144e47c2d 100644 --- a/pkg/kubelet/server/stats/summary.go +++ b/pkg/kubelet/server/stats/summary.go @@ -146,7 +146,11 @@ func (sb *summaryBuilder) build() (*stats.Summary, error) { } for sys, name := range systemContainers { if info, ok := sb.infos[name]; ok { - nodeStats.SystemContainers = append(nodeStats.SystemContainers, sb.containerInfoV2ToStats(sys, &info)) + sysCont := sb.containerInfoV2ToStats(sys, &info) + // System containers don't have a filesystem associated with them. + sysCont.Rootfs = nil + sysCont.Logs = nil + nodeStats.SystemContainers = append(nodeStats.SystemContainers, sysCont) } } diff --git a/pkg/kubelet/server/stats/summary_test.go b/pkg/kubelet/server/stats/summary_test.go index b6d5da19228..7f17170112a 100644 --- a/pkg/kubelet/server/stats/summary_test.go +++ b/pkg/kubelet/server/stats/summary_test.go @@ -183,8 +183,8 @@ func TestBuildSummary(t *testing.T) { assert.EqualValues(t, testTime(creationTime, seed).Unix(), sys.StartTime.Time.Unix(), name+".StartTime") checkCPUStats(t, name, seed, sys.CPU) checkMemoryStats(t, name, seed, info, sys.Memory) - checkFsStats(t, rootfsCapacity, rootfsAvailable, totalRootfsInodes, rootfsInodesFree, sys.Logs) - checkFsStats(t, imagefsCapacity, imagefsAvailable, totalImagefsInodes, imagefsInodesFree, sys.Rootfs) + assert.Nil(t, sys.Logs, name+".Logs") + assert.Nil(t, sys.Rootfs, name+".Rootfs") } assert.Equal(t, 3, len(summary.Pods)) diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index 3b3d30bd1b5..75cb33dbd09 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -74,9 +74,8 @@ var _ = framework.KubeDescribe("Summary API", func() { "PageFaults": bounded(1000, 1E9), "MajorPageFaults": bounded(0, 100000), }), - // TODO(#31999): Don't report FS stats for system containers. - "Rootfs": gstruct.Ignore(), - "Logs": gstruct.Ignore(), + "Rootfs": BeNil(), + "Logs": BeNil(), "UserDefinedMetrics": BeEmpty(), }) // Expectations for pods.