Skip to content

fix: docker working even without containerd #3796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benji2k2 wants to merge 6 commits into
base: master
Choose a base branch
from
+9 −6
Open

fix: docker working even without containerd #3796

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4bdd8fc
Fix for issue #3772
benji2k2 Dec 17, 2025
3ff4710
Update factory.go
benji2k2 Dec 17, 2025
f8fd931
Update factory.go
benji2k2 Dec 17, 2025
86cecde
Update factory.go
benji2k2 Dec 17, 2025
589c4c8
Update container/docker/factory.go
benji2k2 Dec 18, 2025
0ae9dc9
fix formatting
sambhav-jain-16 Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions container/docker/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,10 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics
}

var (
thinPoolWatcher *devicemapper.ThinPoolWatcher
thinPoolName string
zfsWatcher *zfs.ZfsWatcher
thinPoolWatcher *devicemapper.ThinPoolWatcher
thinPoolName string
zfsWatcher *zfs.ZfsWatcher
containerdClient containerd.ContainerdClient
)
if includedMetrics.Has(container.DiskUsageMetrics) {
if StorageDriver(dockerInfo.Driver) == DevicemapperStorageDriver {
Expand All @@ -352,9 +353,11 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics
}
}

containerdClient, err := containerd.Client(*containerd.ArgContainerdEndpoint, "moby")
if err != nil {
return fmt.Errorf("unable to create containerd client: %v", err)
if StorageDriver(dockerInfo.Driver) == ContainerdSnapshotterStorageDriver {
containerdClient, err = containerd.Client(*containerd.ArgContainerdEndpoint, "moby")
if err != nil {
return fmt.Errorf("unable to create containerd client: %v", err)
}
}

klog.V(1).Infof("Registering Docker factory")
Expand Down
Loading