github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34998 from timstclair/sysdisk

Browse Source 
Automatic merge from submit-queue

Don't report FS stats for system containers in the Kubelet Summary API

Fixes https://github.com/kubernetes/kubernetes/issues/31999
This commit is contained in:
Kubernetes Submit Queue
2016-10-20 00:07:56 -07:00
committed by GitHub
parent 0b2674eac7 bd80da5822
commit 333c045429
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_node/summary_test.go
View File

@@ -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.