github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

allow for cadvisor to detect split filesystem and add some e2e tests

Browse Source
This commit is contained in:
Kevin Hannon 2023-11-04 11:52:05 -04:00
parent 3df07e446b
commit d58ff6c056
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cadvisor/cadvisor_linux_test.go
View File

@ -68,7 +68,7 @@ func TestContainerFsInfoLabel(t *testing.T) {
}{{ }{{
description: "LabelCrioWriteableImages should be returned", description: "LabelCrioWriteableImages should be returned",
runtimeEndpoint: crio.CrioSocket, runtimeEndpoint: crio.CrioSocket,
expectedLabel: LabelCrioContainers, expectedLabel: cadvisorfs.LabelCrioContainers,
expectedError: nil, expectedError: nil,
}, { }, {
description: "Cannot find valid imagefs label", description: "Cannot find valid imagefs label",

7
pkg/kubelet/cadvisor/helpers_linux.go
View File

@ -26,11 +26,6 @@ import (
cadvisorfs "github.com/google/cadvisor/fs" cadvisorfs "github.com/google/cadvisor/fs"
) )
// LabelCrioContainers is a label to allow for cadvisor to track writeable layers
// separately from read-only layers.
// Once CAdvisor upstream changes are merged, we should remove this constant
const LabelCrioContainers string = "crio-containers"
// imageFsInfoProvider knows how to translate the configured runtime // imageFsInfoProvider knows how to translate the configured runtime
// to its file system label for images. // to its file system label for images.
type imageFsInfoProvider struct { type imageFsInfoProvider struct {
@ -50,7 +45,7 @@ func (i *imageFsInfoProvider) ImageFsInfoLabel() (string, error) {
// For remote runtimes, it handles addition runtimes natively understood by cAdvisor. // For remote runtimes, it handles addition runtimes natively understood by cAdvisor.
func (i *imageFsInfoProvider) ContainerFsInfoLabel() (string, error) { func (i *imageFsInfoProvider) ContainerFsInfoLabel() (string, error) {
if detectCrioWorkaround(i) { if detectCrioWorkaround(i) {
return LabelCrioContainers, nil return cadvisorfs.LabelCrioContainers, nil
} }
return "", fmt.Errorf("no containerfs label for configured runtime") return "", fmt.Errorf("no containerfs label for configured runtime")
} }