Skip to content
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

Fix: issue cri-dockerd runtime not being found #1899

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Fix: issue cri-dockerd runtime not being found #1899

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0af2fd4
Fix: issue cri-dockerd runtime not being found
FlikweertvisionVadym Jan 27, 2025
739d50b
Update factory.go
FlikweertvisionVadym Jan 29, 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
8 changes: 8 additions & 0 deletions pkg/daemon/criruntime/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,14 @@ func detectRuntime(varRunPath string) (cfgs []runtimeConfig) {
runtimeRemoteURI: fmt.Sprintf("unix://%s/cri-dockerd.sock", varRunPath),
})
}
// Check if the cri-dockerd runtime socket exists in the expected k3s runtime directory.
// If found, append it to the runtime configuration list to ensure k3s can use cri-dockerd.
if _, err = os.Stat(fmt.Sprintf("%s/cri-dockerd/cri-dockerd.sock", varRunPath)); err == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you leave comment above the code about the k3s runtime folder setup ?

Copy link
Contributor Author

@FlikweertvisionVadym FlikweertvisionVadym Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit was signed, comment added.

cfgs = append(cfgs, runtimeConfig{
runtimeType: ContainerRuntimeCommonCRI,
runtimeRemoteURI: fmt.Sprintf("unix://%s/cri-dockerd/cri-dockerd.sock", varRunPath),
})
}
}
return cfgs
}
Loading