-
Notifications
You must be signed in to change notification settings - Fork 776
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.
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
support cri-dockerd.sock
for docker runtime
#1634
Conversation
pkg/daemon/criruntime/factory.go
Outdated
cfgs = append(cfgs, runtimeConfig{ | ||
runtimeType: ContainerRuntimeDocker, | ||
runtimeURI: fmt.Sprintf("unix://%s/docker.sock", varRunPath), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it possible to treat cri-docker as if it is ContainerRuntimeCommonCRI? you can refer to the cri-o implementation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
plz make the code a seperate block, e.g.
// cri-dockerd
{
if _, err = os.Stat(fmt.Sprintf("%s/cri-dockerd.sock", varRunPath)); err == nil {
cfgs = append(cfgs, runtimeConfig{
runtimeType: ContainerRuntimeCommonCRI,
runtimeRemoteURI: fmt.Sprintf("unix://%s/cri-dockerd.sock", varRunPath),
})
}
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done again ~
15ca7c4
to
e4420c1
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1634 +/- ##
==========================================
+ Coverage 47.91% 49.14% +1.22%
==========================================
Files 162 183 +21
Lines 23491 18925 -4566
==========================================
- Hits 11256 9300 -1956
+ Misses 11014 8404 -2610
Partials 1221 1221
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
e4420c1
to
6eeef36
Compare
Signed-off-by: joey <[email protected]>
6eeef36
to
b7f0851
Compare
/lgtm |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: zmberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Signed-off-by: joey <[email protected]>
Ⅰ. Describe what this PR does
support
cri-dockerd.sock
for docker runtime#1631
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how to verify it
https://github.com/Mirantis/cri-dockerd/blob/3248313faac560c1a32244a9015f8ff20c42a29d/cmd/cri/options/options.go#L44-L46
Ⅳ. Special notes for reviews