From 2129e1c4fae8567551d1ac252c7a1dec27617e21 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 31 Oct 2023 07:10:06 -0400 Subject: [PATCH] Avoid using container/podman in manager.go Signed-off-by: Davanum Srinivas --- manager/manager.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manager/manager.go b/manager/manager.go index 4f88e603fe..8043394d5d 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -30,7 +30,6 @@ import ( "github.com/google/cadvisor/cache/memory" "github.com/google/cadvisor/collector" "github.com/google/cadvisor/container" - "github.com/google/cadvisor/container/podman" "github.com/google/cadvisor/container/raw" "github.com/google/cadvisor/events" "github.com/google/cadvisor/fs" @@ -274,7 +273,7 @@ type manager struct { } func (m *manager) PodmanContainer(containerName string, query *info.ContainerInfoRequest) (info.ContainerInfo, error) { - container, err := m.namespacedContainer(containerName, podman.Namespace) + container, err := m.namespacedContainer(containerName, PodmanNamespace) if err != nil { return info.ContainerInfo{}, err } @@ -1386,7 +1385,7 @@ func (m *manager) containersInfo(containers map[string]*containerData, query *in } func (m *manager) AllPodmanContainers(query *info.ContainerInfoRequest) (map[string]info.ContainerInfo, error) { - containers := m.getAllNamespacedContainers(podman.Namespace) + containers := m.getAllNamespacedContainers(PodmanNamespace) return m.containersInfo(containers, query) }